Autogenerated HTML docs for v1.5.6.2-212-g08b5
diff --git a/RelNotes-1.5.6.2.txt b/RelNotes-1.5.6.2.txt index 02d5910..5902a85 100644 --- a/RelNotes-1.5.6.2.txt +++ b/RelNotes-1.5.6.2.txt
@@ -11,21 +11,30 @@ Fixes since v1.5.6.1 -------------------- +* "git clone" from a remote that is named with url.insteadOf setting in + $HOME/.gitconfig did not work well. + +* "git describe --long --tags" segfaulted when the described revision was + tagged with a lightweight tag. + +* "git diff --check" did not report the result via its exit status + reliably. + +* When remote side used to have branch 'foo' and git-fetch finds that now + it has branch 'foo/bar', it refuses to lose the existing remote tracking + branch and its reflog. The error message has been improved to suggest + pruning the remote if the user wants to proceed and get the latest set + of branches from the remote, including such 'foo/bar'. + +* "git reset file" should mean the same thing as "git reset HEAD file", + but we required disambiguating -- even when "file" is not ambiguous. + +* "git show" segfaulted when an annotated tag that points at another + annotated tag was given to it. + * Optimization for a large import via "git-svn" introduced in v1.5.6 had a serious memory and temporary file leak, which made it unusable for moderately large import. * "git-svn" mangled remote nickname used in the configuration file unnecessarily. - -* "git diff --check" did not report the result via its exit status - reliably. - -* "git show" segfaulted when an annotated tag that points at another - annotated tag was given to it. - --- -exec >/var/tmp/1 -echo O=$(git describe maint) -O=v1.5.6.1-13-g4f3dcc2 -git shortlog --no-merges $O..maint
diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt index 514de13..95ad966 100644 --- a/cmds-mainporcelain.txt +++ b/cmds-mainporcelain.txt
@@ -86,7 +86,7 @@ Remove files from the working tree and from the index. linkgit:git-shortlog[1]:: - Summarize 'git log' output. + Summarize 'git-log' output. linkgit:git-show[1]:: Show various types of objects.
diff --git a/config.txt b/config.txt index 561ff64..a403d46 100644 --- a/config.txt +++ b/config.txt
@@ -63,7 +63,7 @@ a string, an integer, or a boolean. Boolean values may be given as yes/no, 0/1 or true/false. Case is not significant in boolean values, when converting value to the canonical form using '--bool' type specifier; -`git-config` will ensure that the output is "true" or "false". +'git-config' will ensure that the output is "true" or "false". String values may be entirely or partially enclosed in double quotes. You need to enclose variable value in double quotes if you want to @@ -118,8 +118,8 @@ See linkgit:git-update-index[1]. True by default. core.quotepath:: - The commands that output paths (e.g. `ls-files`, - `diff`), when not given the `-z` option, will quote + The commands that output paths (e.g. 'ls-files', + 'diff'), when not given the `-z` option, will quote "unusual" characters in the pathname by enclosing the pathname in a double-quote pair and with backslashes the same way strings in C source code are quoted. If this @@ -356,8 +356,8 @@ core.whitespace:: A comma separated list of common whitespace problems to - notice. `git diff` will use `color.diff.whitespace` to - highlight them, and `git apply --whitespace=error` will + notice. 'git-diff' will use `color.diff.whitespace` to + highlight them, and 'git-apply --whitespace=error' will consider them as errors: + * `trailing-space` treats trailing whitespaces at the end of the line @@ -396,11 +396,11 @@ "gitk --all --not ORIG_HEAD". apply.whitespace:: - Tells `git-apply` how to handle whitespaces, in the same way + Tells 'git-apply' how to handle whitespaces, in the same way as the '--whitespace' option. See linkgit:git-apply[1]. branch.autosetupmerge:: - Tells `git-branch` and `git-checkout` to setup new branches + Tells 'git-branch' and 'git-checkout' to setup new branches so that linkgit:git-pull[1] will appropriately merge from the starting point branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` @@ -411,7 +411,7 @@ branch. This option defaults to true. branch.autosetuprebase:: - When a new branch is created with `git-branch` or `git-checkout` + When a new branch is created with 'git-branch' or 'git-checkout' that tracks another branch, this variable tells git to set up pull to rebase instead of merge (see "branch.<name>.rebase"). When `never`, rebase is never automatically set to true. @@ -426,20 +426,20 @@ This option defaults to never. branch.<name>.remote:: - When in branch <name>, it tells `git fetch` which remote to fetch. - If this option is not given, `git fetch` defaults to remote "origin". + When in branch <name>, it tells 'git-fetch' which remote to fetch. + If this option is not given, 'git-fetch' defaults to remote "origin". branch.<name>.merge:: - When in branch <name>, it tells `git fetch` the default + When in branch <name>, it tells 'git-fetch' the default refspec to be marked for merging in FETCH_HEAD. The value is handled like the remote part of a refspec, and must match a ref which is fetched from the remote given by "branch.<name>.remote". - The merge information is used by `git pull` (which at first calls - `git fetch`) to lookup the default branch for merging. Without - this option, `git pull` defaults to merge the first refspec fetched. + The merge information is used by 'git-pull' (which at first calls + 'git-fetch') to lookup the default branch for merging. Without + this option, 'git-pull' defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. - If you wish to setup `git pull` so that it merges into <name> from + If you wish to setup 'git-pull' so that it merges into <name> from another branch in the local repository, you can point branch.<name>.merge to the desired branch, and use the special setting `.` (a period) for branch.<name>.remote. @@ -508,12 +508,12 @@ color.interactive:: When set to `always`, always use colors for interactive prompts - and displays (such as those used by "git add --interactive"). + and displays (such as those used by "git-add --interactive"). When false (or `never`), never. When set to `true` or `auto`, use colors only when the output is to the terminal. Defaults to false. color.interactive.<slot>:: - Use customized color for `git add --interactive` + Use customized color for 'git-add --interactive' output. `<slot>` may be `prompt`, `header`, or `help`, for three distinct types of normal output from interactive programs. The values of these variables may be specified as @@ -550,14 +550,14 @@ take precedence over this setting. Defaults to false. diff.autorefreshindex:: - When using `git diff` to compare with work tree + When using 'git-diff' to compare with work tree files, do not consider stat-only change as changed. Instead, silently run `git update-index --refresh` to update the cached stat information for paths whose contents in the work tree match the contents in the index. This option defaults to true. Note that this - affects only `git diff` Porcelain, and not lower level - `diff` commands, such as `git diff-files`. + affects only 'git-diff' Porcelain, and not lower level + 'diff' commands, such as 'git-diff-files'. diff.external:: If this config variable is set, diff generation is not @@ -568,7 +568,7 @@ diff.renameLimit:: The number of files to consider when performing the copy/rename - detection; equivalent to the git diff option '-l'. + detection; equivalent to the 'git-diff' option '-l'. diff.renames:: Tells git to detect renames. If set to any boolean value, it @@ -608,7 +608,7 @@ gc.aggressiveWindow:: The window size parameter used in the delta compression - algorithm used by 'git gc --aggressive'. This defaults + algorithm used by 'git-gc --aggressive'. This defaults to 10. gc.auto:: @@ -625,37 +625,37 @@ default value is 50. Setting this to 0 disables it. gc.packrefs:: - `git gc` does not run `git pack-refs` in a bare repository by + 'git-gc' does not run `git pack-refs` in a bare repository by default so that older dumb-transport clients can still fetch - from the repository. Setting this to `true` lets `git - gc` to run `git pack-refs`. Setting this to `false` tells - `git gc` never to run `git pack-refs`. The default setting is + from the repository. Setting this to `true` lets 'git-gc' + to run `git pack-refs`. Setting this to `false` tells + 'git-gc' never to run `git pack-refs`. The default setting is `notbare`. Enable it only when you know you do not have to support such clients. The default setting will change to `true` at some stage, and setting this to `false` will continue to - prevent `git pack-refs` from being run from `git gc`. + prevent `git pack-refs` from being run from 'git-gc'. gc.pruneexpire:: - When `git gc` is run, it will call `prune --expire 2.weeks.ago`. + When 'git-gc' is run, it will call 'prune --expire 2.weeks.ago'. Override the grace period with this config variable. gc.reflogexpire:: - `git reflog expire` removes reflog entries older than + 'git-reflog expire' removes reflog entries older than this time; defaults to 90 days. gc.reflogexpireunreachable:: - `git reflog expire` removes reflog entries older than + 'git-reflog expire' removes reflog entries older than this time and are not reachable from the current tip; defaults to 30 days. gc.rerereresolved:: Records of conflicted merge you resolved earlier are - kept for this many days when `git rerere gc` is run. + kept for this many days when 'git-rerere gc' is run. The default is 60 days. See linkgit:git-rerere[1]. gc.rerereunresolved:: Records of conflicted merge you have not resolved are - kept for this many days when `git rerere gc` is run. + kept for this many days when 'git-rerere gc' is run. The default is 15 days. See linkgit:git-rerere[1]. rerere.enabled:: @@ -821,7 +821,7 @@ i18n.logOutputEncoding:: Character encoding the commit messages are converted to when - running `git-log` and friends. + running 'git-log' and friends. instaweb.browser:: Specify the program that will be used to browse your working @@ -844,7 +844,7 @@ log.date:: Set default date-time mode for the log command. Setting log.date - value is similar to using git log's --date option. The value is one of + value is similar to using 'git-log'\'s --date option. The value is one of the following alternatives: {relative,local,default,iso,rfc,short}. See linkgit:git-log[1]. diff --git a/fetch-options.txt b/fetch-options.txt index 85c8718..d313795 100644 --- a/fetch-options.txt +++ b/fetch-options.txt
@@ -21,7 +21,7 @@ -f:: --force:: - When `git-fetch` is used with `<rbranch>:<lbranch>` + When 'git-fetch' is used with `<rbranch>:<lbranch>` refspec, it refuses to update the local branch `<lbranch>` unless the remote branch `<rbranch>` it fetches is a descendant of `<lbranch>`. This option @@ -53,10 +53,10 @@ -u:: --update-head-ok:: - By default `git-fetch` refuses to update the head which + By default 'git-fetch' refuses to update the head which corresponds to the current branch. This flag disables the - check. This is purely for the internal use for `git-pull` - to communicate with `git-fetch`, and unless you are + check. This is purely for the internal use for 'git-pull' + to communicate with 'git-fetch', and unless you are implementing your own Porcelain you are not supposed to use it.
diff --git a/git-am.html b/git-am.html index 830ba27..7fcfa13 100644 --- a/git-am.html +++ b/git-am.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-am(1)</title> </head> @@ -279,15 +327,15 @@ <mbox>|<Maildir>… <em>git am</em> [--skip | --resolved]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Splits mail messages in a mailbox into commit log message, +<div class="para"><p>Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the -current branch.</p> +current branch.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <mbox>|<Maildir>… </dt> @@ -318,7 +366,7 @@ </dt> <dd> <p> - Pass <tt>-k</tt> flag to <tt>git-mailinfo</tt> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>). + Pass <tt>-k</tt> flag to <em>git-mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>). </p> </dd> <dt> @@ -329,21 +377,21 @@ </dt> <dd> <p> - Pass <tt>-u</tt> flag to <tt>git-mailinfo</tt> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>). + Pass <tt>-u</tt> flag to <em>git-mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable <tt>i18n.commitencoding</tt> can be used to specify project's preferred encoding if it is not UTF-8). </p> -<p>This was optional in prior versions of git, but now it is the -default. You could use <tt>--no-utf8</tt> to override this.</p> +<div class="para"><p>This was optional in prior versions of git, but now it is the +default. You could use <tt>--no-utf8</tt> to override this.</p></div> </dd> <dt> --no-utf8 </dt> <dd> <p> - Pass <tt>-n</tt> flag to <tt>git-mailinfo</tt> (see + Pass <tt>-n</tt> flag to <em>git-mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>). </p> </dd> @@ -369,7 +417,7 @@ </dt> <dd> <p> - Pass <tt>--allow-binary-replacement</tt> flag to <tt>git-apply</tt> + Pass <tt>--allow-binary-replacement</tt> flag to <em>git-apply</em> (see <a href="git-apply.html">git-apply(1)</a>). </p> </dd> @@ -378,7 +426,7 @@ </dt> <dd> <p> - This flag is passed to the <tt>git-apply</tt> (see <a href="git-apply.html">git-apply(1)</a>) + This flag is passed to the <em>git-apply</em> (see <a href="git-apply.html">git-apply(1)</a>) program that applies the patch. </p> @@ -391,7 +439,7 @@ </dt> <dd> <p> - These flags are passed to the <tt>git-apply</tt> (see <a href="git-apply.html">git-apply(1)</a>) + These flags are passed to the <em>git-apply</em> (see <a href="git-apply.html">git-apply(1)</a>) program that applies the patch. </p> @@ -441,30 +489,30 @@ to the screen before exiting. This overrides the standard message informing you to use <tt>--resolved</tt> or <tt>--skip</tt> to handle the failure. This is solely - for internal use between <tt>git-rebase</tt> and <tt>git-am</tt>. + for internal use between <em>git-rebase</em> and <em>git-am</em>. </p> </dd> -</dl> +</dl></div> </div> -<h2>DISCUSSION</h2> +<h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> -<p>The commit author name is taken from the "From: " line of the +<div class="para"><p>The commit author name is taken from the "From: " line of the message, and commit author time is taken from the "Date: " line of the message. The "Subject: " line is used as the title of the commit, after stripping common prefix "[PATCH <anything>]". It is supposed to describe what the commit is about concisely as -a one line text.</p> -<p>The body of the message (iow, after a blank line that terminates +a one line text.</p></div> +<div class="para"><p>The body of the message (iow, after a blank line that terminates RFC2822 headers) can begin with "Subject: " and "From: " lines that are different from those of the mail header, to override -the values of these fields.</p> -<p>The commit message is formed by the title taken from the +the values of these fields.</p></div> +<div class="para"><p>The commit message is formed by the title taken from the "Subject: ", a blank line and the body of the message up to where the patch begins. Excess whitespaces at the end of the -lines are automatically stripped.</p> -<p>The patch is expected to be inline, directly following the -message. Any line that is of form:</p> -<ul> +lines are automatically stripped.</p></div> +<div class="para"><p>The patch is expected to be inline, directly following the +message. Any line that is of form:</p></div> +<div class="ilist"><ul> <li> <p> three-dashes and end-of-line, or @@ -480,13 +528,13 @@ a line that begins with "Index: " </p> </li> -</ul> -<p>is taken as the beginning of a patch, and the commit log message -is terminated before the first occurrence of such a line.</p> -<p>When initially invoking it, you give it names of the mailboxes +</ul></div> +<div class="para"><p>is taken as the beginning of a patch, and the commit log message +is terminated before the first occurrence of such a line.</p></div> +<div class="para"><p>When initially invoking it, you give it names of the mailboxes to crunch. Upon seeing the first patch that does not apply, it -aborts in the middle,. You can recover from this in one of two ways:</p> -<ol> +aborts in the middle,. You can recover from this in one of two ways:</p></div> +<div class="olist"><ol> <li> <p> skip the current patch by re-running the command with <em>--skip</em> @@ -500,31 +548,31 @@ have produced. Then run the command with <em>--resolved</em> option. </p> </li> -</ol> -<p>The command refuses to process new mailboxes while <tt>.dotest</tt> +</ol></div> +<div class="para"><p>The command refuses to process new mailboxes while <tt>.dotest</tt> directory exists, so if you decide to start over from scratch, run <tt>rm -f -r .dotest</tt> before running the command with mailbox -names.</p> +names.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-apply.html">git-apply(1)</a>.</p> +<div class="para"><p><a href="git-apply.html">git-apply(1)</a>.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:31 UTC +Last updated 2008-07-06 05:16:34 UTC </div> </div> </body> diff --git a/git-am.txt b/git-am.txt index 1296b91..3863eeb 100644 --- a/git-am.txt +++ b/git-am.txt
@@ -35,11 +35,11 @@ -k:: --keep:: - Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]). + Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). -u:: --utf8:: - Pass `-u` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]). + Pass `-u` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable `i18n.commitencoding` can be used to specify project's @@ -49,7 +49,7 @@ default. You could use `--no-utf8` to override this. --no-utf8:: - Pass `-n` flag to `git-mailinfo` (see + Pass `-n` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). -3:: @@ -61,17 +61,17 @@ -b:: --binary:: - Pass `--allow-binary-replacement` flag to `git-apply` + Pass `--allow-binary-replacement` flag to 'git-apply' (see linkgit:git-apply[1]). --whitespace=<option>:: - This flag is passed to the `git-apply` (see linkgit:git-apply[1]) + This flag is passed to the 'git-apply' (see linkgit:git-apply[1]) program that applies the patch. -C<n>:: -p<n>:: - These flags are passed to the `git-apply` (see linkgit:git-apply[1]) + These flags are passed to the 'git-apply' (see linkgit:git-apply[1]) program that applies the patch. @@ -97,7 +97,7 @@ to the screen before exiting. This overrides the standard message informing you to use `--resolved` or `--skip` to handle the failure. This is solely - for internal use between `git-rebase` and `git-am`. + for internal use between 'git-rebase' and 'git-am'. DISCUSSION ----------
diff --git a/git-apply.html b/git-apply.html index 7283225..13ba322 100644 --- a/git-apply.html +++ b/git-apply.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-apply(1)</title> </head> @@ -280,14 +328,14 @@ [--whitespace=<nowarn|warn|fix|error|error-all>] [--exclude=PATH] [--verbose] [<patch>…]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Reads supplied diff output and applies it on a git index file -and a work tree.</p> +<div class="para"><p>Reads supplied <em>diff</em> output and applies it on a git index file +and a work tree.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <patch>… </dt> @@ -368,14 +416,14 @@ </dt> <dd> <p> - Newer <tt>git-diff</tt> output has embedded <em>index information</em> + Newer <em>git-diff</em> output has embedded <em>index information</em> for each blob to help identify the original version that the patch applies to. When this flag is given, and if the original versions of the blobs is available locally, builds a temporary index containing those blobs. </p> -<p>When a pure mode change is encountered (which has no index information), -the information is read from the current index instead.</p> +<div class="para"><p>When a pure mode change is encountered (which has no index information), +the information is read from the current index instead.</p></div> </dd> <dt> -R @@ -393,7 +441,7 @@ </dt> <dd> <p> - For atomicity, <tt>git-apply</tt> by default fails the whole patch and + For atomicity, <em>git-apply</em> by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave the @@ -437,14 +485,14 @@ </dt> <dd> <p> - By default, <tt>git-apply</tt> expects that the patch being + By default, <em>git-apply</em> expects that the patch being applied is a unified diff with at least one line of context. This provides good safety measures, but breaks down when applying a diff generated with --unified=0. To bypass these checks use <em>--unidiff-zero</em>. </p> -<p>Note, for the reasons stated above usage of context-free patches are -discouraged.</p> +<div class="para"><p>Note, for the reasons stated above usage of context-free patches are +discouraged.</p></div> </dd> <dt> --apply @@ -452,7 +500,7 @@ <dd> <p> If you use any of the options marked "Turns off - <em>apply</em>" above, <tt>git-apply</tt> reads and outputs the + <em>apply</em>" above, <em>git-apply</em> reads and outputs the information you asked without actually applying the patch. Give this flag after those flags to also apply the patch. @@ -465,7 +513,7 @@ <p> When applying a patch, ignore additions made by the patch. This can be used to extract the common part between - two files by first running <tt>diff</tt> on them and applying + two files by first running <em>diff</em> on them and applying the result with this option, which would apply the deletion part but not addition part. </p> @@ -507,12 +555,12 @@ by a tab character inside the initial indent of the line are considered whitespace errors. </p> -<p>By default, the command outputs warning messages but applies the patch. +<div class="para"><p>By default, the command outputs warning messages but applies the patch. When <tt>git-apply is used for statistics and not applying a -patch, it defaults to `nowarn</tt>.</p> -<p>You can use different <tt><action></tt> to control this -behavior:</p> -<ul> +patch, it defaults to `nowarn</tt>.</p></div> +<div class="para"><p>You can use different <tt><action></tt> to control this +behavior:</p></div> +<div class="ilist"><ul> <li> <p> <tt>nowarn</tt> turns off the trailing whitespace warning. @@ -543,16 +591,16 @@ <tt>error-all</tt> is similar to <tt>error</tt> but shows all errors. </p> </li> -</ul> +</ul></div> </dd> <dt> --inaccurate-eof </dt> <dd> <p> - Under certain circumstances, some versions of diff do not correctly + Under certain circumstances, some versions of <em>diff</em> do not correctly detect a missing new-line at the end of the file. As a result, patches - created by such diff programs do not record incomplete lines + created by such <em>diff</em> programs do not record incomplete lines correctly. This option adds support for applying such patches by working around this bug. </p> @@ -580,11 +628,11 @@ adjusting the hunk headers appropriately). </p> </dd> -</dl> +</dl></div> </div> -<h2>Configuration</h2> +<h2 id="_configuration">Configuration</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> apply.whitespace </dt> @@ -594,36 +642,36 @@ line, this configuration item is used as the default. </p> </dd> -</dl> +</dl></div> </div> -<h2>Submodules</h2> +<h2 id="_submodules">Submodules</h2> <div class="sectionbody"> -<p>If the patch contains any changes to submodules then <tt>git-apply</tt> -treats these changes as follows.</p> -<p>If --index is specified (explicitly or implicitly), then the submodule +<div class="para"><p>If the patch contains any changes to submodules then <em>git-apply</em> +treats these changes as follows.</p></div> +<div class="para"><p>If --index is specified (explicitly or implicitly), then the submodule commits must match the index exactly for the patch to apply. If any of the submodules are checked-out, then these check-outs are completely ignored, i.e., they are not required to be up-to-date or clean and they -are not updated.</p> -<p>If --index is not specified, then the submodule commits in the patch +are not updated.</p></div> +<div class="para"><p>If --index is not specified, then the submodule commits in the patch are ignored and only the absence of presence of the corresponding -subdirectory is checked and (if possible) updated.</p> +subdirectory is checked and (if possible) updated.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano</p> +<div class="para"><p>Documentation by Junio C Hamano</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:32 UTC +Last updated 2008-07-06 05:16:34 UTC </div> </div> </body> diff --git a/git-apply.txt b/git-apply.txt index 70d19f6..e9f724b 100644 --- a/git-apply.txt +++ b/git-apply.txt
@@ -18,7 +18,7 @@ DESCRIPTION ----------- -Reads supplied diff output and applies it on a git index file +Reads supplied 'diff' output and applies it on a git index file and a work tree. OPTIONS @@ -64,7 +64,7 @@ without using the working tree. This implies '--index'. --build-fake-ancestor <file>:: - Newer `git-diff` output has embedded 'index information' + Newer 'git-diff' output has embedded 'index information' for each blob to help identify the original version that the patch applies to. When this flag is given, and if the original versions of the blobs is available locally, @@ -78,7 +78,7 @@ Apply the patch in reverse. --reject:: - For atomicity, `git-apply` by default fails the whole patch and + For atomicity, 'git-apply' by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave the @@ -102,7 +102,7 @@ ever ignored. --unidiff-zero:: - By default, `git-apply` expects that the patch being + By default, 'git-apply' expects that the patch being applied is a unified diff with at least one line of context. This provides good safety measures, but breaks down when applying a diff generated with --unified=0. To bypass these @@ -113,7 +113,7 @@ --apply:: If you use any of the options marked "Turns off - 'apply'" above, `git-apply` reads and outputs the + 'apply'" above, 'git-apply' reads and outputs the information you asked without actually applying the patch. Give this flag after those flags to also apply the patch. @@ -121,7 +121,7 @@ --no-add:: When applying a patch, ignore additions made by the patch. This can be used to extract the common part between - two files by first running `diff` on them and applying + two files by first running 'diff' on them and applying the result with this option, which would apply the deletion part but not addition part. @@ -165,9 +165,9 @@ * `error-all` is similar to `error` but shows all errors. --inaccurate-eof:: - Under certain circumstances, some versions of diff do not correctly + Under certain circumstances, some versions of 'diff' do not correctly detect a missing new-line at the end of the file. As a result, patches - created by such diff programs do not record incomplete lines + created by such 'diff' programs do not record incomplete lines correctly. This option adds support for applying such patches by working around this bug. @@ -191,7 +191,7 @@ Submodules ---------- -If the patch contains any changes to submodules then `git-apply` +If the patch contains any changes to submodules then 'git-apply' treats these changes as follows. If --index is specified (explicitly or implicitly), then the submodule
diff --git a/git-archimport.html b/git-archimport.html index d2f8c36..67315b9 100644 --- a/git-archimport.html +++ b/git-archimport.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-archimport(1)</title> </head> @@ -276,53 +324,53 @@ <div class="content"><em>git archimport</em> [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir] <archive/branch>[:<git-branch>] …</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Imports a project from one or more Arch repositories. It will follow branches +<div class="para"><p>Imports a project from one or more Arch repositories. It will follow branches and repositories within the namespaces defined by the <archive/branch> parameters supplied. If it cannot find the remote branch a merge comes from it will just import it as a regular commit. If it can find it, it will mark it -as a merge whenever possible (see discussion below).</p> -<p>The script expects you to provide the key roots where it can start the import +as a merge whenever possible (see discussion below).</p></div> +<div class="para"><p>The script expects you to provide the key roots where it can start the import from an <em>initial import</em> or <em>tag</em> type of Arch commit. It will follow and -import new branches within the provided roots.</p> -<p>It expects to be dealing with one project only. If it sees +import new branches within the provided roots.</p></div> +<div class="para"><p>It expects to be dealing with one project only. If it sees branches that have different roots, it will refuse to run. In that case, edit your <archive/branch> parameters to define clearly the scope of the -import.</p> -<p><tt>git-archimport</tt> uses <tt>tla</tt> extensively in the background to access the +import.</p></div> +<div class="para"><p><em>git-archimport</em> uses <tt>tla</tt> extensively in the background to access the Arch repository. Make sure you have a recent version of <tt>tla</tt> available in the path. <tt>tla</tt> must -know about the repositories you pass to <tt>git-archimport</tt>.</p> -<p>For the initial import, <tt>git-archimport</tt> expects to find itself in an empty +know about the repositories you pass to <em>git-archimport</em>.</p></div> +<div class="para"><p>For the initial import, <em>git-archimport</em> expects to find itself in an empty directory. To follow the development of a project that uses Arch, rerun -<tt>git-archimport</tt> with the same parameters as the initial import to perform -incremental imports.</p> -<p>While <tt>git-archimport</tt> will try to create sensible branch names for the +<em>git-archimport</em> with the same parameters as the initial import to perform +incremental imports.</p></div> +<div class="para"><p>While <em>git-archimport</em> will try to create sensible branch names for the archives that it imports, it is also possible to specify git branch names manually. To do so, write a git branch name after each <archive/branch> parameter, separated by a colon. This way, you can shorten the Arch branch names and convert Arch jargon to git jargon, for example mapping a -"PROJECT--devo--VERSION" branch to "master".</p> -<p>Associating multiple Arch branches to one git branch is possible; the +"PROJECT--devo--VERSION" branch to "master".</p></div> +<div class="para"><p>Associating multiple Arch branches to one git branch is possible; the result will make the most sense only if no commits are made to the first branch, after the second branch is created. Still, this is useful to -convert Arch repositories that had been rotated periodically.</p> +convert Arch repositories that had been rotated periodically.</p></div> </div> -<h2>MERGES</h2> +<h2 id="_merges">MERGES</h2> <div class="sectionbody"> -<p>Patch merge data from Arch is used to mark merges in git as well. git +<div class="para"><p>Patch merge data from Arch is used to mark merges in git as well. git does not care much about tracking patches, and only considers a merge when a branch incorporates all the commits since the point they forked. The end result is that git will have a good idea of how far branches have diverged. So the -import process does lose some patch-trading metadata.</p> -<p>Fortunately, when you try and merge branches imported from Arch, +import process does lose some patch-trading metadata.</p></div> +<div class="para"><p>Fortunately, when you try and merge branches imported from Arch, git will find a good merge base, and it has a good chance of identifying -patches that have been traded out-of-sequence between the branches.</p> +patches that have been traded out-of-sequence between the branches.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -h </dt> @@ -364,7 +412,7 @@ <dd> <p> Use this for compatibility with old-style branch names used by - earlier versions of <tt>git-archimport</tt>. Old-style branch names + earlier versions of <em>git-archimport</em>. Old-style branch names were category--branch, whereas new-style branch names are archive,category--branch--version. In both cases, names given on the command-line will override the automatically-generated @@ -406,23 +454,23 @@ Archive/branch identifier in a format that <tt>tla log</tt> understands. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Martin Langhoff <martin@catalyst.net.nz>.</p> +<div class="para"><p>Written by Martin Langhoff <martin@catalyst.net.nz>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:32 UTC +Last updated 2008-07-06 05:16:35 UTC </div> </div> </body> diff --git a/git-archimport.txt b/git-archimport.txt index f089deb..c7a6e3e 100644 --- a/git-archimport.txt +++ b/git-archimport.txt
@@ -29,17 +29,17 @@ edit your <archive/branch> parameters to define clearly the scope of the import. -`git-archimport` uses `tla` extensively in the background to access the +'git-archimport' uses `tla` extensively in the background to access the Arch repository. Make sure you have a recent version of `tla` available in the path. `tla` must -know about the repositories you pass to `git-archimport`. +know about the repositories you pass to 'git-archimport'. -For the initial import, `git-archimport` expects to find itself in an empty +For the initial import, 'git-archimport' expects to find itself in an empty directory. To follow the development of a project that uses Arch, rerun -`git-archimport` with the same parameters as the initial import to perform +'git-archimport' with the same parameters as the initial import to perform incremental imports. -While `git-archimport` will try to create sensible branch names for the +While 'git-archimport' will try to create sensible branch names for the archives that it imports, it is also possible to specify git branch names manually. To do so, write a git branch name after each <archive/branch> parameter, separated by a colon. This way, you can shorten the Arch @@ -84,7 +84,7 @@ -o:: Use this for compatibility with old-style branch names used by - earlier versions of `git-archimport`. Old-style branch names + earlier versions of 'git-archimport'. Old-style branch names were category--branch, whereas new-style branch names are archive,category--branch--version. In both cases, names given on the command-line will override the automatically-generated
diff --git a/git-archive.html b/git-archive.html index b954970..ed183dd 100644 --- a/git-archive.html +++ b/git-archive.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-archive(1)</title> </head> @@ -277,24 +325,24 @@ [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish> [path…]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Creates an archive of the specified format containing the tree +<div class="para"><p>Creates an archive of the specified format containing the tree structure for the named tree, and writes it out to the standard output. If <prefix> is specified it is -prepended to the filenames in the archive.</p> -<p><tt>git-archive</tt> behaves differently when given a tree ID versus when +prepended to the filenames in the archive.</p></div> +<div class="para"><p><em>git-archive</em> behaves differently when given a tree ID versus when given a commit ID or tag ID. In the first case the current time is used as modification time of each file in the archive. In the latter case the commit time as recorded in the referenced commit object is used instead. Additionally the commit ID is stored in a global extended pax header if the tar format is used; it can be extracted -using <tt>git-get-tar-commit-id</tt>. In ZIP files it is stored as a file -comment.</p> +using <em>git-get-tar-commit-id</em>. In ZIP files it is stored as a file +comment.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --format=<fmt> </dt> @@ -358,7 +406,7 @@ <dd> <p> Used with --remote to specify the path to the - <tt>git-upload-archive</tt> on the remote side. + <em>git-upload-archive</em> on the remote side. </p> </dd> <dt> @@ -378,12 +426,12 @@ archive, otherwise include all files and subdirectories. </p> </dd> -</dl> +</dl></div> </div> -<h2>BACKEND EXTRA OPTIONS</h2> +<h2 id="_backend_extra_options">BACKEND EXTRA OPTIONS</h2> <div class="sectionbody"> -<h3>zip</h3> -<dl> +<h3 id="_zip">zip</h3><div style="clear:left"></div> +<div class="vlist"><dl> <dt> -0 </dt> @@ -401,11 +449,11 @@ number from 1 to 9 to adjust compression speed and ratio. </p> </dd> -</dl> +</dl></div> </div> -<h2>CONFIGURATION</h2> +<h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> tar.umask </dt> @@ -418,11 +466,11 @@ details. </p> </dd> -</dl> +</dl></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -) </dt> @@ -459,23 +507,23 @@ into <em>git-1.4.0-docs.zip</em>, with the prefix <em>git-docs/</em>. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Franck Bui-Huu and Rene Scharfe.</p> +<div class="para"><p>Written by Franck Bui-Huu and Rene Scharfe.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:32 UTC +Last updated 2008-07-06 05:16:35 UTC </div> </div> </body> diff --git a/git-archive.txt b/git-archive.txt index dbe9bad..41cbf9c 100644 --- a/git-archive.txt +++ b/git-archive.txt
@@ -20,13 +20,13 @@ output. If <prefix> is specified it is prepended to the filenames in the archive. -`git-archive` behaves differently when given a tree ID versus when +'git-archive' behaves differently when given a tree ID versus when given a commit ID or tag ID. In the first case the current time is used as modification time of each file in the archive. In the latter case the commit time as recorded in the referenced commit object is used instead. Additionally the commit ID is stored in a global extended pax header if the tar format is used; it can be extracted -using `git-get-tar-commit-id`. In ZIP files it is stored as a file +using 'git-get-tar-commit-id'. In ZIP files it is stored as a file comment. OPTIONS @@ -57,7 +57,7 @@ --exec=<git-upload-archive>:: Used with --remote to specify the path to the - `git-upload-archive` on the remote side. + 'git-upload-archive' on the remote side. <tree-ish>:: The tree or commit to produce an archive for.
diff --git a/git-bisect.html b/git-bisect.html index 0a39d97..ee7465e 100644 --- a/git-bisect.html +++ b/git-bisect.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-bisect(1)</title> </head> @@ -272,12 +320,12 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git bisect</em> <subcommand> <options></p> +<div class="para"><p><em>git bisect</em> <subcommand> <options></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>The command takes various subcommands, and different options depending -on the subcommand:</p> +<div class="para"><p>The command takes various subcommands, and different options depending +on the subcommand:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git bisect help @@ -291,14 +339,14 @@ git bisect log git bisect run <cmd>...</tt></pre> </div></div> -<p>This command uses <tt>git rev-list --bisect</tt> to help drive the +<div class="para"><p>This command uses <em>git-rev-list --bisect</em> to help drive the binary search process to find which change introduced a bug, given an -old "good" commit object name and a later "bad" commit object name.</p> -<h3>Getting help</h3> -<p>Use "git bisect" to get a short usage description, and "git bisect -help" or "git bisect -h" to get a long usage description.</p> -<h3>Basic bisect commands: start, bad, good</h3> -<p>The way you use it is:</p> +old "good" commit object name and a later "bad" commit object name.</p></div> +<h3 id="_getting_help">Getting help</h3><div style="clear:left"></div> +<div class="para"><p>Use "git bisect" to get a short usage description, and "git bisect +help" or "git bisect -h" to get a long usage description.</p></div> +<h3 id="_basic_bisect_commands_start_bad_good">Basic bisect commands: start, bad, good</h3><div style="clear:left"></div> +<div class="para"><p>The way you use it is:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect start @@ -306,74 +354,74 @@ $ git bisect good v2.6.13-rc2 # v2.6.13-rc2 was the last version # tested that was good</tt></pre> </div></div> -<p>When you give at least one bad and one good versions, it will bisect -the revision tree and say something like:</p> +<div class="para"><p>When you give at least one bad and one good versions, it will bisect +the revision tree and say something like:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>Bisecting: 675 revisions left to test after this</tt></pre> </div></div> -<p>and check out the state in the middle. Now, compile that kernel, and +<div class="para"><p>and check out the state in the middle. Now, compile that kernel, and boot it. Now, let's say that this booted kernel works fine, then just -do</p> +do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect good # this one is good</tt></pre> </div></div> -<p>which will now say</p> +<div class="para"><p>which will now say</p></div> <div class="listingblock"> <div class="content"> <pre><tt>Bisecting: 337 revisions left to test after this</tt></pre> </div></div> -<p>and you continue along, compiling that one, testing it, and depending +<div class="para"><p>and you continue along, compiling that one, testing it, and depending on whether it is good or bad, you say "git bisect good" or "git bisect -bad", and ask for the next bisection.</p> -<p>Until you have no more left, and you'll have been left with the first -bad kernel rev in "refs/bisect/bad".</p> -<h3>Bisect reset</h3> -<p>Oh, and then after you want to reset to the original head, do a</p> +bad", and ask for the next bisection.</p></div> +<div class="para"><p>Until you have no more left, and you'll have been left with the first +bad kernel rev in "refs/bisect/bad".</p></div> +<h3 id="_bisect_reset">Bisect reset</h3><div style="clear:left"></div> +<div class="para"><p>Oh, and then after you want to reset to the original head, do a</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect reset</tt></pre> </div></div> -<p>to get back to the original branch, instead of being on the bisection +<div class="para"><p>to get back to the original branch, instead of being on the bisection commit ("git bisect start" will do that for you too, actually: it will -reset the bisection state).</p> -<h3>Bisect visualize</h3> -<p>During the bisection process, you can say</p> +reset the bisection state).</p></div> +<h3 id="_bisect_visualize">Bisect visualize</h3><div style="clear:left"></div> +<div class="para"><p>During the bisection process, you can say</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect visualize</tt></pre> </div></div> -<p>to see the currently remaining suspects in <tt>gitk</tt>. <tt>visualize</tt> is a bit -too long to type and <tt>view</tt> is provided as a synonym.</p> -<p>If <tt>DISPLAY</tt> environment variable is not set, <tt>git log</tt> is used +<div class="para"><p>to see the currently remaining suspects in <em>gitk</em>. <tt>visualize</tt> is a bit +too long to type and <tt>view</tt> is provided as a synonym.</p></div> +<div class="para"><p>If <em>DISPLAY</em> environment variable is not set, <em>git-log</em> is used instead. You can even give command line options such as <tt>-p</tt> and -<tt>--stat</tt>.</p> +<tt>--stat</tt>.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect view --stat</tt></pre> </div></div> -<h3>Bisect log and bisect replay</h3> -<p>The good/bad input is logged, and</p> +<h3 id="_bisect_log_and_bisect_replay">Bisect log and bisect replay</h3><div style="clear:left"></div> +<div class="para"><p>The good/bad input is logged, and</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect log</tt></pre> </div></div> -<p>shows what you have done so far. You can truncate its output somewhere -and save it in a file, and run</p> +<div class="para"><p>shows what you have done so far. You can truncate its output somewhere +and save it in a file, and run</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect replay that-file</tt></pre> </div></div> -<p>if you find later you made a mistake telling good/bad about a -revision.</p> -<h3>Avoiding to test a commit</h3> -<p>If in a middle of bisect session, you know what the bisect suggested +<div class="para"><p>if you find later you made a mistake telling good/bad about a +revision.</p></div> +<h3 id="_avoiding_to_test_a_commit">Avoiding to test a commit</h3><div style="clear:left"></div> +<div class="para"><p>If in a middle of bisect session, you know what the bisect suggested to try next is not a good one to test (e.g. the change the commit introduces is known not to work in your environment and you know it does not have anything to do with the bug you are chasing), you may -want to find a near-by commit and try that instead.</p> -<p>It goes something like this:</p> +want to find a near-by commit and try that instead.</p></div> +<div class="para"><p>It goes something like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect good/bad # previous round was good/bad. @@ -382,69 +430,69 @@ $ git reset --hard HEAD~3 # try 3 revs before what # was suggested</tt></pre> </div></div> -<p>Then compile and test the one you chose to try. After that, tell -bisect what the result was as usual.</p> -<h3>Bisect skip</h3> -<p>Instead of choosing by yourself a nearby commit, you may just want git -to do it for you using:</p> +<div class="para"><p>Then compile and test the one you chose to try. After that, tell +bisect what the result was as usual.</p></div> +<h3 id="_bisect_skip">Bisect skip</h3><div style="clear:left"></div> +<div class="para"><p>Instead of choosing by yourself a nearby commit, you may just want git +to do it for you using:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect skip # Current version cannot be tested</tt></pre> </div></div> -<p>But computing the commit to test may be slower afterwards and git may +<div class="para"><p>But computing the commit to test may be slower afterwards and git may eventually not be able to tell the first bad among a bad and one or -more "skip"ped commits.</p> -<h3>Cutting down bisection by giving more parameters to bisect start</h3> -<p>You can further cut down the number of trials if you know what part of +more "skip"ped commits.</p></div> +<h3 id="_cutting_down_bisection_by_giving_more_parameters_to_bisect_start">Cutting down bisection by giving more parameters to bisect start</h3><div style="clear:left"></div> +<div class="para"><p>You can further cut down the number of trials if you know what part of the tree is involved in the problem you are tracking down, by giving -paths parameters when you say <tt>bisect start</tt>, like this:</p> +paths parameters when you say <tt>bisect start</tt>, like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect start -- arch/i386 include/asm-i386</tt></pre> </div></div> -<p>If you know beforehand more than one good commits, you can narrow the +<div class="para"><p>If you know beforehand more than one good commits, you can narrow the bisect space down without doing the whole tree checkout every time you give good commits. You give the bad revision immediately after <tt>start</tt> -and then you give all the good revisions you have:</p> +and then you give all the good revisions you have:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect start v2.6.20-rc6 v2.6.20-rc4 v2.6.20-rc1 -- # v2.6.20-rc6 is bad # v2.6.20-rc4 and v2.6.20-rc1 are good</tt></pre> </div></div> -<h3>Bisect run</h3> -<p>If you have a script that can tell if the current source code is good -or bad, you can automatically bisect using:</p> +<h3 id="_bisect_run">Bisect run</h3><div style="clear:left"></div> +<div class="para"><p>If you have a script that can tell if the current source code is good +or bad, you can automatically bisect using:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect run my_script</tt></pre> </div></div> -<p>Note that the "run" script (<tt>my_script</tt> in the above example) should +<div class="para"><p>Note that the "run" script (<tt>my_script</tt> in the above example) should exit with code 0 in case the current source code is good. Exit with a code between 1 and 127 (inclusive), except 125, if the current -source code is bad.</p> -<p>Any other exit code will abort the automatic bisect process. (A +source code is bad.</p></div> +<div class="para"><p>Any other exit code will abort the automatic bisect process. (A program that does "exit(-1)" leaves $? = 255, see exit(3) manual page, -the value is chopped with "& 0377".)</p> -<p>The special exit code 125 should be used when the current source code +the value is chopped with "& 0377".)</p></div> +<div class="para"><p>The special exit code 125 should be used when the current source code cannot be tested. If the "run" script exits with this code, the current -revision will be skipped, see <tt>git bisect skip</tt> above.</p> -<p>You may often find that during bisect you want to have near-constant +revision will be skipped, see <tt>git bisect skip</tt> above.</p></div> +<div class="para"><p>You may often find that during bisect you want to have near-constant tweaks (e.g., s/#define DEBUG 0/#define DEBUG 1/ in a header file, or "revision that does not have this commit needs this patch applied to work around other problem this bisection is not interested in") -applied to the revision being tested.</p> -<p>To cope with such a situation, after the inner <tt>git-bisect</tt> finds the +applied to the revision being tested.</p></div> +<div class="para"><p>To cope with such a situation, after the inner <em>git-bisect</em> finds the next revision to test, with the "run" script, you can apply that tweak before compiling, run the real test, and after the test decides if the revision (possibly with the needed tweaks) passed the test, rewind the tree to the pristine state. Finally the "run" script can exit with the status of the real test to let the "git bisect run" command loop to -determine the outcome.</p> +determine the outcome.</p></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<ul> +<div class="ilist"><ul> <li> <p> Automatically bisect a broken build between v1.2 and HEAD: @@ -468,13 +516,13 @@ $ git bisect start v1.3 v1.1 -- # v1.3 is bad, v1.1 is good $ git bisect run ~/test.sh</tt></pre> </div></div> -<p>Here we use a "test.sh" custom script. In this script, if "make" -fails, we "skip" the current commit.</p> -<p>It's safer to use a custom script outside the repo to prevent +<div class="para"><p>Here we use a "test.sh" custom script. In this script, if "make" +fails, we "skip" the current commit.</p></div> +<div class="para"><p>It's safer to use a custom script outside the repo to prevent interactions between the bisect, make and test processes and the -script.</p> -<p>And "make test" should "exit 0", if the test suite passes, and -"exit 1" (for example) otherwise.</p> +script.</p></div> +<div class="para"><p>And "make test" should "exit 0", if the test suite passes, and +"exit 1" (for example) otherwise.</p></div> </li> <li> <p> @@ -489,29 +537,29 @@ $ git bisect start HEAD HEAD~10 -- # culprit is among the last 10 $ git bisect run ~/test.sh</tt></pre> </div></div> -<p>Here "check_test_case.sh" should "exit 0", if the test case passes, -and "exit 1" (for example) otherwise.</p> -<p>It's safer if both "test.sh" and "check_test_case.sh" scripts are +<div class="para"><p>Here "check_test_case.sh" should "exit 0", if the test case passes, +and "exit 1" (for example) otherwise.</p></div> +<div class="para"><p>It's safer if both "test.sh" and "check_test_case.sh" scripts are outside the repo to prevent interactions between the bisect, make and -test processes and the scripts.</p> +test processes and the scripts.</p></div> </li> -</ul> +</ul></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:32 UTC +Last updated 2008-07-06 05:16:35 UTC </div> </div> </body> diff --git a/git-bisect.txt b/git-bisect.txt index 8bbcb94..c7981ef 100644 --- a/git-bisect.txt +++ b/git-bisect.txt
@@ -26,7 +26,7 @@ git bisect log git bisect run <cmd>... -This command uses `git rev-list --bisect` to help drive the +This command uses 'git-rev-list --bisect' to help drive the binary search process to find which change introduced a bug, given an old "good" commit object name and a later "bad" commit object name. @@ -98,10 +98,10 @@ $ git bisect visualize ------------ -to see the currently remaining suspects in `gitk`. `visualize` is a bit +to see the currently remaining suspects in 'gitk'. `visualize` is a bit too long to type and `view` is provided as a synonym. -If `DISPLAY` environment variable is not set, `git log` is used +If 'DISPLAY' environment variable is not set, 'git-log' is used instead. You can even give command line options such as `-p` and `--stat`. @@ -215,7 +215,7 @@ work around other problem this bisection is not interested in") applied to the revision being tested. -To cope with such a situation, after the inner `git-bisect` finds the +To cope with such a situation, after the inner 'git-bisect' finds the next revision to test, with the "run" script, you can apply that tweak before compiling, run the real test, and after the test decides if the revision (possibly with the needed tweaks) passed the test, rewind the
diff --git a/git-blame.html b/git-blame.html index 84a08c4..1e92ad4 100644 --- a/git-blame.html +++ b/git-blame.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-blame(1)</title> </head> @@ -277,19 +325,19 @@ [-S <revs-file>] [-M] [-C] [-C] [--since=<date>] [<rev> | --contents <file>] [--] <file></div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Annotates each line in the given file with information from the revision which -last modified the line. Optionally, start annotating from the given revision.</p> -<p>Also it can limit the range of lines annotated.</p> -<p>This report doesn't tell you anything about lines which have been deleted or -replaced; you need to use a tool such as <tt>git-diff</tt> or the "pickaxe" -interface briefly mentioned in the following paragraph.</p> -<p>Apart from supporting file annotation, git also supports searching the +<div class="para"><p>Annotates each line in the given file with information from the revision which +last modified the line. Optionally, start annotating from the given revision.</p></div> +<div class="para"><p>Also it can limit the range of lines annotated.</p></div> +<div class="para"><p>This report doesn't tell you anything about lines which have been deleted or +replaced; you need to use a tool such as <em>git-diff</em> or the "pickaxe" +interface briefly mentioned in the following paragraph.</p></div> +<div class="para"><p>Apart from supporting file annotation, git also supports searching the development history for when a code snippet occurred in a change. This makes it possible to track when a code snippet was added to a file, moved or copied between files, and eventually deleted or replaced. It works by searching for -a text string in the diff. A small example:</p> +a text string in the diff. A small example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log --pretty=oneline -S'blame_usage' @@ -297,9 +345,9 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre> </div></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -b </dt> @@ -334,30 +382,30 @@ Annotate only the given line range. <start> and <end> can take one of these forms: </p> -<ul> +<div class="ilist"><ul> <li> <p> number </p> -<p>If <start> or <end> is a number, it specifies an -absolute line number (lines count from 1).</p> +<div class="para"><p>If <start> or <end> is a number, it specifies an +absolute line number (lines count from 1).</p></div> </li> <li> <p> /regex/ </p> -<p>This form will use the first line matching the given +<div class="para"><p>This form will use the first line matching the given POSIX regex. If <end> is a regex, it will search -starting at the line given by <start>.</p> +starting at the line given by <start>.</p></div> </li> <li> <p> +offset or -offset </p> -<p>This is only valid for <end> and will specify a number -of lines before or after the line given by <start>.</p> +<div class="para"><p>This is only valid for <end> and will specify a number +of lines before or after the line given by <start>.</p></div> </li> -</ul> +</ul></div> </dd> <dt> -l @@ -429,10 +477,10 @@ to the child commit. With this option, both groups of lines are blamed on the parent. </p> -<p><num> is optional but it is the lower bound on the number of +<div class="para"><p><num> is optional but it is the lower bound on the number of alphanumeric characters that git must detect as moving within a file for it to associate those lines with the parent -commit.</p> +commit.</p></div> </dd> <dt> -C|<num>| @@ -446,10 +494,10 @@ the command looks for copies from all other files in the parent for the commit that creates the file in addition. </p> -<p><num> is optional but it is the lower bound on the number of +<div class="para"><p><num> is optional but it is the lower bound on the number of alphanumeric characters that git must detect as moving between files for it to associate those lines with the parent -commit.</p> +commit.</p></div> </dd> <dt> -h @@ -480,7 +528,7 @@ file (see <tt>-M</tt>). The first number listed is the score. This is the number of alphanumeric characters detected to be moved between or within files. This must be above - a certain threshold for <tt>git-blame</tt> to consider those lines + a certain threshold for <em>git-blame</em> to consider those lines of code to have been moved. </p> </dd> @@ -525,13 +573,13 @@ child's to find where the lines came from. </p> </dd> -</dl> +</dl></div> </div> -<h2>THE PORCELAIN FORMAT</h2> +<h2 id="_the_porcelain_format">THE PORCELAIN FORMAT</h2> <div class="sectionbody"> -<p>In this format, each line is output after a header; the -header at the minimum has the first line which has:</p> -<ul> +<div class="para"><p>In this format, each line is output after a header; the +header at the minimum has the first line which has:</p></div> +<div class="ilist"><ul> <li> <p> 40-byte SHA-1 of the commit the line is attributed to; @@ -554,10 +602,10 @@ group. On subsequent lines this field is absent. </p> </li> -</ul> -<p>This header line is followed by the following information -at least once for each commit:</p> -<ul> +</ul></div> +<div class="para"><p>This header line is followed by the following information +at least once for each commit:</p></div> +<div class="ilist"><ul> <li> <p> author name ("author"), email ("author-mail"), time @@ -575,70 +623,70 @@ the first line of the commit log message ("summary"). </p> </li> -</ul> -<p>The contents of the actual line is output after the above +</ul></div> +<div class="para"><p>The contents of the actual line is output after the above header, prefixed by a TAB. This is to allow adding more -header elements later.</p> +header elements later.</p></div> </div> -<h2>SPECIFYING RANGES</h2> +<h2 id="_specifying_ranges">SPECIFYING RANGES</h2> <div class="sectionbody"> -<p>Unlike <tt>git-blame</tt> and <tt>git-annotate</tt> in older git, the extent +<div class="para"><p>Unlike <em>git-blame</em> and <em>git-annotate</em> in older git, the extent of annotation can be limited to both line ranges and revision ranges. When you are interested in finding the origin for ll. 40-60 for file <tt>foo</tt>, you can use <tt>-L</tt> option like these (they mean the same thing — both ask for 21 lines starting at -line 40):</p> +line 40):</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git blame -L 40,60 foo git blame -L 40,+21 foo</tt></pre> </div></div> -<p>Also you can use regular expression to specify the line range.</p> +<div class="para"><p>Also you can use regular expression to specify the line range.</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git blame -L '/^sub hello {/,/^}$/' foo</tt></pre> </div></div> -<p>would limit the annotation to the body of <tt>hello</tt> subroutine.</p> -<p>When you are not interested in changes older than the version +<div class="para"><p>would limit the annotation to the body of <tt>hello</tt> subroutine.</p></div> +<div class="para"><p>When you are not interested in changes older than the version v2.6.18, or changes older than 3 weeks, you can use revision -range specifiers similar to <tt>git-rev-list</tt>:</p> +range specifiers similar to <em>git-rev-list</em>:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git blame v2.6.18.. -- foo git blame --since=3.weeks -- foo</tt></pre> </div></div> -<p>When revision range specifiers are used to limit the annotation, +<div class="para"><p>When revision range specifiers are used to limit the annotation, lines that have not changed since the range boundary (either the commit v2.6.18 or the most recent commit that is more than 3 weeks old in the above example) are blamed for that range -boundary commit.</p> -<p>A particularly useful way is to see if an added file have lines +boundary commit.</p></div> +<div class="para"><p>A particularly useful way is to see if an added file have lines created by copy-and-paste from existing files. Sometimes this indicates that the developer was being sloppy and did not refactor the code properly. You can first find the commit that -introduced the file with:</p> +introduced the file with:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git log --diff-filter=A --pretty=short -- foo</tt></pre> </div></div> -<p>and then annotate the change between the commit and its -parents, using <tt>commit^!</tt> notation:</p> +<div class="para"><p>and then annotate the change between the commit and its +parents, using <tt>commit^!</tt> notation:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git blame -C -C -f $commit^! -- foo</tt></pre> </div></div> </div> -<h2>INCREMENTAL OUTPUT</h2> +<h2 id="_incremental_output">INCREMENTAL OUTPUT</h2> <div class="sectionbody"> -<p>When called with <tt>--incremental</tt> option, the command outputs the +<div class="para"><p>When called with <tt>--incremental</tt> option, the command outputs the result as it is built. The output generally will talk about lines touched by more recent commits first (i.e. the lines will be annotated out of order) and is meant to be used by -interactive viewers.</p> -<p>The output format is similar to the Porcelain format, but it +interactive viewers.</p></div> +<div class="para"><p>The output format is similar to the Porcelain format, but it does not contain the actual lines from the file that is being -annotated.</p> -<ol> +annotated.</p></div> +<div class="olist"><ol> <li> <p> Each blame entry always starts with a line of: @@ -647,7 +695,7 @@ <div class="content"> <pre><tt><40-byte hex sha1> <sourceline> <resultline> <num_lines></tt></pre> </div></div> -<p>Line numbers count from 1.</p> +<div class="para"><p>Line numbers count from 1.</p></div> </li> <li> <p> @@ -666,8 +714,8 @@ <div class="content"> <pre><tt>"filename" <whitespace-quoted-filename-goes-here></tt></pre> </div></div> -<p>and thus it's really quite easy to parse for some line- and word-oriented -parser (which should be quite natural for most scripting languages).</p> +<div class="para"><p>and thus it's really quite easy to parse for some line- and word-oriented +parser (which should be quite natural for most scripting languages).</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -682,23 +730,23 @@ </tr></table> </div> </li> -</ol> +</ol></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-annotate.html">git-annotate(1)</a></p> +<div class="para"><p><a href="git-annotate.html">git-annotate(1)</a></p></div> </div> -<h2>AUTHOR</h2> +<h2 id="_author">AUTHOR</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:33 UTC +Last updated 2008-07-06 05:16:35 UTC </div> </div> </body> diff --git a/git-blame.txt b/git-blame.txt index 443039f..34b24a3 100644 --- a/git-blame.txt +++ b/git-blame.txt
@@ -21,7 +21,7 @@ Also it can limit the range of lines annotated. This report doesn't tell you anything about lines which have been deleted or -replaced; you need to use a tool such as `git-diff` or the "pickaxe" +replaced; you need to use a tool such as 'git-diff' or the "pickaxe" interface briefly mentioned in the following paragraph. Apart from supporting file annotation, git also supports searching the @@ -49,7 +49,7 @@ file (see `-M`). The first number listed is the score. This is the number of alphanumeric characters detected to be moved between or within files. This must be above - a certain threshold for `git-blame` to consider those lines + a certain threshold for 'git-blame' to consider those lines of code to have been moved. -f:: @@ -100,7 +100,7 @@ SPECIFYING RANGES ----------------- -Unlike `git-blame` and `git-annotate` in older git, the extent +Unlike 'git-blame' and 'git-annotate' in older git, the extent of annotation can be limited to both line ranges and revision ranges. When you are interested in finding the origin for ll. 40-60 for file `foo`, you can use `-L` option like these @@ -118,7 +118,7 @@ When you are not interested in changes older than the version v2.6.18, or changes older than 3 weeks, you can use revision -range specifiers similar to `git-rev-list`: +range specifiers similar to 'git-rev-list': git blame v2.6.18.. -- foo git blame --since=3.weeks -- foo
diff --git a/git-branch.html b/git-branch.html index 2c1f887..6365ba2 100644 --- a/git-branch.html +++ b/git-branch.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-branch(1)</title> </head> @@ -280,9 +328,9 @@ <em>git branch</em> (-m | -M) [<oldbranch>] <newbranch> <em>git branch</em> (-d | -D) [-r] <branchname>…</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>With no arguments given a list of existing branches +<div class="para"><p>With no arguments given a list of existing branches will be shown, the current branch will be highlighted with an asterisk. Option <tt>-r</tt> causes the remote-tracking branches to be listed, and option <tt>-a</tt> shows both. @@ -290,36 +338,36 @@ contains the named commit (in other words, the branches whose tip commits are descendant of the named commit). With <tt>--merged</tt>, only branches merged into HEAD will be listed, and -with <tt>--no-merged</tt> only branches not merged into HEAD will be listed.</p> -<p>In its second form, a new branch named <branchname> will be created. +with <tt>--no-merged</tt> only branches not merged into HEAD will be listed.</p></div> +<div class="para"><p>In its second form, a new branch named <branchname> will be created. It will start out with a head equal to the one given as <start-point>. If no <start-point> is given, the branch will be created with a head -equal to that of the currently checked out branch.</p> -<p>Note that this will create the new branch, but it will not switch the +equal to that of the currently checked out branch.</p></div> +<div class="para"><p>Note that this will create the new branch, but it will not switch the working tree to it; use "git checkout <newbranch>" to switch to the -new branch.</p> -<p>When a local branch is started off a remote branch, git sets up the -branch so that <tt>git-pull</tt> will appropriately merge from +new branch.</p></div> +<div class="para"><p>When a local branch is started off a remote branch, git sets up the +branch so that <em>git-pull</em> will appropriately merge from the remote branch. This behavior may be changed via the global <tt>branch.autosetupmerge</tt> configuration flag. That setting can be -overridden by using the <tt>--track</tt> and <tt>--no-track</tt> options.</p> -<p>With a <em>-m</em> or <em>-M</em> option, <oldbranch> will be renamed to <newbranch>. +overridden by using the <tt>--track</tt> and <tt>--no-track</tt> options.</p></div> +<div class="para"><p>With a <em>-m</em> or <em>-M</em> option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename -to happen.</p> -<p>With a <tt>-d</tt> or <tt>-D</tt> option, <tt><branchname></tt> will be deleted. You may +to happen.</p></div> +<div class="para"><p>With a <tt>-d</tt> or <tt>-D</tt> option, <tt><branchname></tt> will be deleted. You may specify more than one branch for deletion. If the branch currently -has a reflog then the reflog will also be deleted.</p> -<p>Use -r together with -d to delete remote-tracking branches. Note, that it +has a reflog then the reflog will also be deleted.</p></div> +<div class="para"><p>Use -r together with -d to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist -in remote repository or if <tt>git-fetch</tt> was configured not to fetch +in remote repository or if <em>git-fetch</em> was configured not to fetch them again. See also <em>prune</em> subcommand of <a href="git-remote.html">git-remote(1)</a> for way to -clean up all obsolete remote-tracking branches.</p> +clean up all obsolete remote-tracking branches.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -d </dt> @@ -437,14 +485,14 @@ </dt> <dd> <p> - When creating a new branch, set up configuration so that <tt>git-pull</tt> + When creating a new branch, set up configuration so that <em>git-pull</em> will automatically retrieve data from the start point, which must be a branch. Use this if you always pull from the same upstream branch into the new branch, and if you don't want to use "git pull <repository> <refspec>" explicitly. This behavior is the default when the start point is a remote branch. Set the branch.autosetupmerge configuration variable to <tt>false</tt> if you want - <tt>git-checkout</tt> and <tt>git-branch</tt> to always behave as if <em>--no-track</em> were + <em>git-checkout</em> and <em>git-branch</em> to always behave as if <em>--no-track</em> were given. Set it to <tt>always</tt> if you want this behavior when the start-point is either a local or remote branch. </p> @@ -519,11 +567,11 @@ <branchname> applies. </p> </dd> -</dl> +</dl></div> </div> -<h2>Examples</h2> +<h2 id="_examples">Examples</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> Start development off of a known tag </dt> @@ -535,14 +583,14 @@ $ git branch my2.6.14 v2.6.14 <b>(1)</b> $ git checkout my2.6.14</tt></pre> </div></div> -<ol> +<div class="colist"><ol> <li> <p> This step and the next one could be combined into a single step with "checkout -b my2.6.14 v2.6.14". </p> </li> -</ol> +</ol></div> </dd> <dt> Delete unneeded branch @@ -555,7 +603,7 @@ $ git branch -d -r origin/todo origin/html origin/man <b>(1)</b> $ git branch -D test <b>(2)</b></tt></pre> </div></div> -<ol> +<div class="colist"><ol> <li> <p> Delete remote-tracking branches "todo", "html", "man". Next <em>fetch</em> or @@ -569,18 +617,18 @@ currently checked out) does not have all commits from test branch. </p> </li> -</ol> +</ol></div> </dd> -</dl> +</dl></div> </div> -<h2>Notes</h2> +<h2 id="_notes">Notes</h2> <div class="sectionbody"> -<p>If you are creating a branch that you want to immediately checkout, it's +<div class="para"><p>If you are creating a branch that you want to immediately checkout, it's easier to use the git checkout command with its <tt>-b</tt> option to create -a branch and check it out with a single command.</p> -<p>The options <tt>--contains</tt>, <tt>--merged</tt> and <tt>--no-merged</tt> serves three related -but different purposes:</p> -<ul> +a branch and check it out with a single command.</p></div> +<div class="para"><p>The options <tt>--contains</tt>, <tt>--merged</tt> and <tt>--no-merged</tt> serves three related +but different purposes:</p></div> +<div class="ilist"><ul> <li> <p> <tt>--contains <commit></tt> is used to find all branches which will need @@ -600,23 +648,23 @@ into HEAD, since those branches are not fully contained by HEAD. </p> </li> -</ul> +</ul></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:33 UTC +Last updated 2008-07-06 05:16:36 UTC </div> </div> </body> diff --git a/git-branch.txt b/git-branch.txt index 5e78aed..b3e62ed 100644 --- a/git-branch.txt +++ b/git-branch.txt
@@ -37,7 +37,7 @@ new branch. When a local branch is started off a remote branch, git sets up the -branch so that `git-pull` will appropriately merge from +branch so that 'git-pull' will appropriately merge from the remote branch. This behavior may be changed via the global `branch.autosetupmerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options. @@ -54,7 +54,7 @@ Use -r together with -d to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist -in remote repository or if `git-fetch` was configured not to fetch +in remote repository or if 'git-fetch' was configured not to fetch them again. See also 'prune' subcommand of linkgit:git-remote[1] for way to clean up all obsolete remote-tracking branches. @@ -107,14 +107,14 @@ Display the full sha1s in output listing rather than abbreviating them. --track:: - When creating a new branch, set up configuration so that `git-pull` + When creating a new branch, set up configuration so that 'git-pull' will automatically retrieve data from the start point, which must be a branch. Use this if you always pull from the same upstream branch into the new branch, and if you don't want to use "git pull <repository> <refspec>" explicitly. This behavior is the default when the start point is a remote branch. Set the branch.autosetupmerge configuration variable to `false` if you want - `git-checkout` and `git-branch` to always behave as if '--no-track' were + 'git-checkout' and 'git-branch' to always behave as if '--no-track' were given. Set it to `always` if you want this behavior when the start-point is either a local or remote branch.
diff --git a/git-bundle.html b/git-bundle.html index 3ec368b..0dedd9c 100644 --- a/git-bundle.html +++ b/git-bundle.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-bundle(1)</title> </head> @@ -278,31 +326,31 @@ <em>git bundle</em> list-heads <file> [refname…] <em>git bundle</em> unbundle <file> [refname…]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Some workflows require that one or more branches of development on one +<div class="para"><p>Some workflows require that one or more branches of development on one machine be replicated on another machine, but the two machines cannot be directly connected so the interactive git protocols (git, ssh, rsync, http) cannot be used. This command provides support for -<tt>git-fetch</tt> and <tt>git-pull</tt> to operate by packaging objects and references +<em>git-fetch</em> and <em>git-pull</em> to operate by packaging objects and references in an archive at the originating machine, then importing those into -another repository using <tt>git-fetch</tt> and <tt>git-pull</tt> +another repository using <em>git-fetch</em> and <em>git-pull</em> after moving the archive by some means (i.e., by sneakernet). As no direct connection between repositories exists, the user must specify a basis for the bundle that is held by the destination repository: the bundle assumes that all objects in the basis are already in the -destination repository.</p> +destination repository.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> create <file> </dt> <dd> <p> Used to create a bundle named <em>file</em>. This requires the - <tt>git-rev-list</tt> arguments to define the bundle contents. + <em>git-rev-list</em> arguments to define the bundle contents. </p> </dd> <dt> @@ -314,7 +362,7 @@ cleanly to the current repository. This includes checks on the bundle format itself as well as checking that the prerequisite commits exist and are fully linked in the current repository. - <tt>git-bundle</tt> prints a list of missing commits, if any, and exits + <em>git-bundle</em> prints a list of missing commits, if any, and exits with non-zero status. </p> </dd> @@ -333,11 +381,11 @@ </dt> <dd> <p> - Passes the objects in the bundle to <tt>git-index-pack</tt> + Passes the objects in the bundle to <em>git-index-pack</em> for storage in the repository, then prints the names of all defined references. If a reflist is given, only references matching those in the given list are printed. This command is - really plumbing, intended to be called only by <tt>git-fetch</tt>. + really plumbing, intended to be called only by <em>git-fetch</em>. </p> </dd> <dt> @@ -345,8 +393,8 @@ </dt> <dd> <p> - A list of arguments, acceptable to <tt>git-rev-parse</tt> and - <tt>git-rev-list</tt>, that specify the specific objects and references + A list of arguments, acceptable to <em>git-rev-parse</em> and + <em>git-rev-list</em>, that specify the specific objects and references to transport. For example, "master~10..master" causes the current master reference to be packaged along with all objects added since its 10th ancestor commit. There is no explicit @@ -360,130 +408,130 @@ <dd> <p> A list of references used to limit the references reported as - available. This is principally of use to <tt>git-fetch</tt>, which + available. This is principally of use to <em>git-fetch</em>, which expects to receive only those references asked for and not - necessarily everything in the pack (in this case, <tt>git-bundle</tt> is - acting like <tt>git-fetch-pack</tt>). + necessarily everything in the pack (in this case, <em>git-bundle</em> is + acting like <em>git-fetch-pack</em>). </p> </dd> -</dl> +</dl></div> </div> -<h2>SPECIFYING REFERENCES</h2> +<h2 id="_specifying_references">SPECIFYING REFERENCES</h2> <div class="sectionbody"> -<p><tt>git-bundle</tt> will only package references that are shown by -<tt>git-show-ref</tt>: this includes heads, tags, and remote heads. References -such as master~1 cannot be packaged, but are perfectly suitable for +<div class="para"><p><em>git-bundle</em> will only package references that are shown by +<em>git-show-ref</em>: this includes heads, tags, and remote heads. References +such as master<sub>1 cannot be packaged, but are perfectly suitable for defining the basis. More than one reference may be packaged, and more than one basis can be specified. The objects packaged are those not contained in the union of the given bases. Each basis can be -specified explicitly (e.g., ^master~10), or implicitly (e.g., -master~10..master, master --since=10.days.ago).</p> -<p>It is very important that the basis used be held by the destination. +specified explicitly (e.g., ^master</sub>10), or implicitly (e.g., +master~10..master, master --since=10.days.ago).</p></div> +<div class="para"><p>It is very important that the basis used be held by the destination. It is okay to err on the side of conservatism, causing the bundle file to contain objects already in the destination as these are ignored -when unpacking at the destination.</p> +when unpacking at the destination.</p></div> </div> -<h2>EXAMPLE</h2> +<h2 id="_example">EXAMPLE</h2> <div class="sectionbody"> -<p>Assume two repositories exist as R1 on machine A, and R2 on machine B. +<div class="para"><p>Assume two repositories exist as R1 on machine A, and R2 on machine B. For whatever reason, direct connection between A and B is not allowed, but we can move data from A to B via some mechanism (CD, email, etc). -We want to update R2 with developments made on branch master in R1.</p> -<p>To create the bundle you have to specify the basis. You have some options:</p> -<ul> +We want to update R2 with developments made on branch master in R1.</p></div> +<div class="para"><p>To create the bundle you have to specify the basis. You have some options:</p></div> +<div class="ilist"><ul> <li> <p> Without basis. </p> -<p>This is useful when sending the whole history.</p> +<div class="para"><p>This is useful when sending the whole history.</p></div> </li> -</ul> +</ul></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bundle create mybundle master</tt></pre> </div></div> -<ul> +<div class="ilist"><ul> <li> <p> Using temporally tags. </p> -<p>We set a tag in R1 (lastR2bundle) after the previous such transport, -and move it afterwards to help build the bundle.</p> +<div class="para"><p>We set a tag in R1 (lastR2bundle) after the previous such transport, +and move it afterwards to help build the bundle.</p></div> </li> -</ul> +</ul></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bundle create mybundle master ^lastR2bundle $ git tag -f lastR2bundle master</tt></pre> </div></div> -<ul> +<div class="ilist"><ul> <li> <p> Using a tag present in both repositories </p> </li> -</ul> +</ul></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bundle create mybundle master ^v1.0.0</tt></pre> </div></div> -<ul> +<div class="ilist"><ul> <li> <p> A basis based on time. </p> </li> -</ul> +</ul></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bundle create mybundle master --since=10.days.ago</tt></pre> </div></div> -<ul> +<div class="ilist"><ul> <li> <p> With a limit on the number of commits </p> </li> -</ul> +</ul></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bundle create mybundle master -n 10</tt></pre> </div></div> -<p>Then you move mybundle from A to B, and in R2 on B:</p> +<div class="para"><p>Then you move mybundle from A to B, and in R2 on B:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bundle verify mybundle $ git fetch mybundle master:localRef</tt></pre> </div></div> -<p>With something like this in the config in R2:</p> +<div class="para"><p>With something like this in the config in R2:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[remote "bundle"] url = /home/me/tmp/file.bdl fetch = refs/heads/*:refs/remotes/origin/*</tt></pre> </div></div> -<p>You can first sneakernet the bundle file to ~/tmp/file.bdl and -then these commands on machine B:</p> +<div class="para"><p>You can first sneakernet the bundle file to ~/tmp/file.bdl and +then these commands on machine B:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git ls-remote bundle $ git fetch bundle $ git pull bundle</tt></pre> </div></div> -<p>would treat it as if it is talking with a remote side over the -network.</p> +<div class="para"><p>would treat it as if it is talking with a remote side over the +network.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Mark Levedahl <mdl123@verizon.net></p> +<div class="para"><p>Written by Mark Levedahl <mdl123@verizon.net></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:33 UTC +Last updated 2008-07-06 05:16:36 UTC </div> </div> </body> diff --git a/git-bundle.txt b/git-bundle.txt index b729db7..1b66ab7 100644 --- a/git-bundle.txt +++ b/git-bundle.txt
@@ -21,9 +21,9 @@ machine be replicated on another machine, but the two machines cannot be directly connected so the interactive git protocols (git, ssh, rsync, http) cannot be used. This command provides support for -`git-fetch` and `git-pull` to operate by packaging objects and references +'git-fetch' and 'git-pull' to operate by packaging objects and references in an archive at the originating machine, then importing those into -another repository using `git-fetch` and `git-pull` +another repository using 'git-fetch' and 'git-pull' after moving the archive by some means (i.e., by sneakernet). As no direct connection between repositories exists, the user must specify a basis for the bundle that is held by the destination repository: the @@ -35,14 +35,14 @@ create <file>:: Used to create a bundle named 'file'. This requires the - `git-rev-list` arguments to define the bundle contents. + 'git-rev-list' arguments to define the bundle contents. verify <file>:: Used to check that a bundle file is valid and will apply cleanly to the current repository. This includes checks on the bundle format itself as well as checking that the prerequisite commits exist and are fully linked in the current repository. - `git-bundle` prints a list of missing commits, if any, and exits + 'git-bundle' prints a list of missing commits, if any, and exits with non-zero status. list-heads <file>:: @@ -51,15 +51,15 @@ printed out. unbundle <file>:: - Passes the objects in the bundle to `git-index-pack` + Passes the objects in the bundle to 'git-index-pack' for storage in the repository, then prints the names of all defined references. If a reflist is given, only references matching those in the given list are printed. This command is - really plumbing, intended to be called only by `git-fetch`. + really plumbing, intended to be called only by 'git-fetch'. [git-rev-list-args...]:: - A list of arguments, acceptable to `git-rev-parse` and - `git-rev-list`, that specify the specific objects and references + A list of arguments, acceptable to 'git-rev-parse' and + 'git-rev-list', that specify the specific objects and references to transport. For example, "master~10..master" causes the current master reference to be packaged along with all objects added since its 10th ancestor commit. There is no explicit @@ -69,16 +69,16 @@ [refname...]:: A list of references used to limit the references reported as - available. This is principally of use to `git-fetch`, which + available. This is principally of use to 'git-fetch', which expects to receive only those references asked for and not - necessarily everything in the pack (in this case, `git-bundle` is - acting like `git-fetch-pack`). + necessarily everything in the pack (in this case, 'git-bundle' is + acting like 'git-fetch-pack'). SPECIFYING REFERENCES --------------------- -`git-bundle` will only package references that are shown by -`git-show-ref`: this includes heads, tags, and remote heads. References +'git-bundle' will only package references that are shown by +'git-show-ref': this includes heads, tags, and remote heads. References such as master~1 cannot be packaged, but are perfectly suitable for defining the basis. More than one reference may be packaged, and more than one basis can be specified. The objects packaged are those not
diff --git a/git-check-ref-format.html b/git-check-ref-format.html index 85c588a..0796f48 100644 --- a/git-check-ref-format.html +++ b/git-check-ref-format.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-check-ref-format(1)</title> </head> @@ -272,17 +320,17 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git check-ref-format</em> <refname></p> +<div class="para"><p><em>git check-ref-format</em> <refname></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Checks if a given <em>refname</em> is acceptable, and exits non-zero if -it is not.</p> -<p>A reference is used in git to specify branches and tags. A +<div class="para"><p>Checks if a given <em>refname</em> is acceptable, and exits non-zero if +it is not.</p></div> +<div class="para"><p>A reference is used in git to specify branches and tags. A branch head is stored under <tt>$GIT_DIR/refs/heads</tt> directory, and a tag is stored under <tt>$GIT_DIR/refs/tags</tt> directory. git -imposes the following rules on how refs are named:</p> -<ol> +imposes the following rules on how refs are named:</p></div> +<div class="olist"><ol> <li> <p> It can include slash <tt>/</tt> for hierarchical (directory) @@ -308,12 +356,12 @@ It cannot end with a slash <tt>/</tt>. </p> </li> -</ol> -<p>These rules makes it easy for shell script based tools to parse +</ol></div> +<div class="para"><p>These rules makes it easy for shell script based tools to parse refnames, pathname expansion by the shell when a refname is used unquoted (by mistake), and also avoids ambiguities in certain -refname expressions (see <a href="git-rev-parse.html">git-rev-parse(1)</a>). Namely:</p> -<ol> +refname expressions (see <a href="git-rev-parse.html">git-rev-parse(1)</a>). Namely:</p></div> +<div class="olist"><ol> <li> <p> double-dot <tt>..</tt> are often used as in <tt>ref1..ref2</tt>, and in some @@ -332,18 +380,18 @@ colon <tt>:</tt> is used as in <tt>srcref:dstref</tt> to mean "use srcref's value and store it in dstref" in fetch and push operations. It may also be used to select a specific object such as with - <tt>git-cat-file</tt>: "git cat-file blob v1.3.3:refs.c". + 'git-cat-file': "git cat-file blob v1.3.3:refs.c". </p> </li> -</ol> +</ol></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:35 UTC +Last updated 2008-07-06 05:16:37 UTC </div> </div> </body> diff --git a/git-check-ref-format.txt b/git-check-ref-format.txt index 429083b..034223c 100644 --- a/git-check-ref-format.txt +++ b/git-check-ref-format.txt
@@ -47,7 +47,7 @@ . colon `:` is used as in `srcref:dstref` to mean "use srcref\'s value and store it in dstref" in fetch and push operations. It may also be used to select a specific object such as with - `git-cat-file`: "git cat-file blob v1.3.3:refs.c". + 'git-cat-file': "git cat-file blob v1.3.3:refs.c". GIT
diff --git a/git-checkout-index.html b/git-checkout-index.html index 76e81a0..cd74976 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-checkout-index(1)</title> </head> @@ -279,14 +327,14 @@ [-z] [--stdin] [--] [<file>]*</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Will copy all files listed from the index to the working directory -(not overwriting existing files).</p> +<div class="para"><p>Will copy all files listed from the index to the working directory +(not overwriting existing files).</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -u </dt> @@ -401,75 +449,75 @@ Do not interpret any more arguments as options. </p> </dd> -</dl> -<p>The order of the flags used to matter, but not anymore.</p> -<p>Just doing <tt>git checkout-index</tt> does nothing. You probably meant +</dl></div> +<div class="para"><p>The order of the flags used to matter, but not anymore.</p></div> +<div class="para"><p>Just doing <tt>git checkout-index</tt> does nothing. You probably meant <tt>git checkout-index -a</tt>. And if you want to force it, you want -<tt>git checkout-index -f -a</tt>.</p> -<p>Intuitiveness is not the goal here. Repeatability is. The reason for +<tt>git checkout-index -f -a</tt>.</p></div> +<div class="para"><p>Intuitiveness is not the goal here. Repeatability is. The reason for the "no arguments means no work" behavior is that from scripts you are -supposed to be able to do:</p> +supposed to be able to do:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ find . -name '*.h' -print0 | xargs -0 git checkout-index -f --</tt></pre> </div></div> -<p>which will force all existing <tt>*.h</tt> files to be replaced with their +<div class="para"><p>which will force all existing <tt>*.h</tt> files to be replaced with their cached copies. If an empty command line implied "all", then this would force-refresh everything in the index, which was not the point. But -since <tt>git-checkout-index</tt> accepts --stdin it would be faster to use:</p> +since <em>git-checkout-index</em> accepts --stdin it would be faster to use:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ find . -name '*.h' -print0 | git checkout-index -f -z --stdin</tt></pre> </div></div> -<p>The <tt>--</tt> is just a good idea when you know the rest will be filenames; +<div class="para"><p>The <tt>--</tt> is just a good idea when you know the rest will be filenames; it will prevent problems with a filename of, for example, <tt>-a</tt>. -Using <tt>--</tt> is probably a good policy in scripts.</p> +Using <tt>--</tt> is probably a good policy in scripts.</p></div> </div> -<h2>Using --temp or --stage=all</h2> +<h2 id="_using_temp_or_stage_all">Using --temp or --stage=all</h2> <div class="sectionbody"> -<p>When <tt>--temp</tt> is used (or implied by <tt>--stage=all</tt>) -<tt>git-checkout-index</tt> will create a temporary file for each index +<div class="para"><p>When <tt>--temp</tt> is used (or implied by <tt>--stage=all</tt>) +<em>git-checkout-index</em> will create a temporary file for each index entry being checked out. The index will not be updated with stat information. These options can be useful if the caller needs all stages of all unmerged entries so that the unmerged files can be -processed by an external merge tool.</p> -<p>A listing will be written to stdout providing the association of +processed by an external merge tool.</p></div> +<div class="para"><p>A listing will be written to stdout providing the association of temporary file names to tracked path names. The listing format -has two variations:</p> -<ol> +has two variations:</p></div> +<div class="olist"><ol> <li> <p> tempname TAB path RS </p> -<p>The first format is what gets used when <tt>--stage</tt> is omitted or +<div class="para"><p>The first format is what gets used when <tt>--stage</tt> is omitted or is not <tt>--stage=all</tt>. The field tempname is the temporary file name holding the file content and path is the tracked path name in -the index. Only the requested entries are output.</p> +the index. Only the requested entries are output.</p></div> </li> <li> <p> stage1temp SP stage2temp SP stage3tmp TAB path RS </p> -<p>The second format is what gets used when <tt>--stage=all</tt>. The three +<div class="para"><p>The second format is what gets used when <tt>--stage=all</tt>. The three stage temporary fields (stage1temp, stage2temp, stage3temp) list the name of the temporary file if there is a stage entry in the index or <tt>.</tt> if there is no stage entry. Paths which only have a stage 0 -entry will always be omitted from the output.</p> +entry will always be omitted from the output.</p></div> </li> -</ol> -<p>In both formats RS (the record separator) is newline by default +</ol></div> +<div class="para"><p>In both formats RS (the record separator) is newline by default but will be the null byte if -z was passed on the command line. The temporary file names are always safe strings; they will never contain directory separators or whitespace characters. The path field is always relative to the current directory and the temporary -file names are always relative to the top level directory.</p> -<p>If the object being copied out to a temporary file is a symbolic +file names are always relative to the top level directory.</p></div> +<div class="para"><p>If the object being copied out to a temporary file is a symbolic link the content of the link will be written to a normal file. It is -up to the end-user or the Porcelain to make use of this information.</p> +up to the end-user or the Porcelain to make use of this information.</p></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> To update and refresh only the files already checked out </dt> @@ -480,23 +528,23 @@ </div></div> </dd> <dt> -Using <tt>git-checkout-index</tt> to "export an entire tree" +Using <em>git-checkout-index</em> to "export an entire tree" </dt> <dd> <p> The prefix ability basically makes it trivial to use - <tt>git-checkout-index</tt> as an "export as tree" function. + <em>git-checkout-index</em> as an "export as tree" function. Just read the desired tree into the index, and do: </p> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout-index --prefix=git-export-dir/ -a</tt></pre> </div></div> -<p><tt>git checkout-index</tt> will "export" the index into the specified -directory.</p> -<p>The final "/" is important. The exported name is literally just +<div class="para"><p><tt>git checkout-index</tt> will "export" the index into the specified +directory.</p></div> +<div class="para"><p>The final "/" is important. The exported name is literally just prefixed with the specified string. Contrast this with the -following example.</p> +following example.</p></div> </dd> <dt> Export files with a prefix @@ -506,27 +554,27 @@ <div class="content"> <pre><tt>$ git checkout-index --prefix=.merged- Makefile</tt></pre> </div></div> -<p>This will check out the currently cached copy of <tt>Makefile</tt> -into the file <tt>.merged-Makefile</tt>.</p> +<div class="para"><p>This will check out the currently cached copy of <tt>Makefile</tt> +into the file <tt>.merged-Makefile</tt>.</p></div> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, -Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, +Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:34 UTC +Last updated 2008-07-06 05:16:37 UTC </div> </div> </body> diff --git a/git-checkout-index.txt b/git-checkout-index.txt index a833a4d..62d8483 100644 --- a/git-checkout-index.txt +++ b/git-checkout-index.txt
@@ -88,7 +88,7 @@ which will force all existing `*.h` files to be replaced with their cached copies. If an empty command line implied "all", then this would force-refresh everything in the index, which was not the point. But -since `git-checkout-index` accepts --stdin it would be faster to use: +since 'git-checkout-index' accepts --stdin it would be faster to use: ---------------- $ find . -name '*.h' -print0 | git checkout-index -f -z --stdin @@ -102,7 +102,7 @@ Using --temp or --stage=all --------------------------- When `--temp` is used (or implied by `--stage=all`) -`git-checkout-index` will create a temporary file for each index +'git-checkout-index' will create a temporary file for each index entry being checked out. The index will not be updated with stat information. These options can be useful if the caller needs all stages of all unmerged entries so that the unmerged files can be @@ -147,9 +147,9 @@ $ git checkout-index -n -f -a && git update-index --ignore-missing --refresh ---------------- -Using `git-checkout-index` to "export an entire tree":: +Using 'git-checkout-index' to "export an entire tree":: The prefix ability basically makes it trivial to use - `git-checkout-index` as an "export as tree" function. + 'git-checkout-index' as an "export as tree" function. Just read the desired tree into the index, and do: + ----------------
diff --git a/git-checkout.html b/git-checkout.html index 8765bef..22230f0 100644 --- a/git-checkout.html +++ b/git-checkout.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-checkout(1)</title> </head> @@ -276,15 +324,15 @@ <div class="content"><em>git checkout</em> [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>] <em>git checkout</em> [<tree-ish>] <paths>…</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>When <paths> are not given, this command switches branches by +<div class="para"><p>When <paths> are not given, this command switches branches by updating the index and working tree to reflect the specified branch, <branch>, and updating HEAD to be <branch> or, if specified, <new_branch>. Using -b will cause <new_branch> to be created; in this case you can use the --track or --no-track -options, which will be passed to <tt>git branch</tt>.</p> -<p>When <paths> are given, this command does <strong>not</strong> switch +options, which will be passed to <tt>git branch</tt>.</p></div> +<div class="para"><p>When <paths> are given, this command does <strong>not</strong> switch branches. It updates the named paths in the working tree from the index file (i.e. it runs <tt>git checkout-index -f -u</tt>), or from a named commit. In @@ -292,11 +340,11 @@ either of them results in an error. <tree-ish> argument can be used to specify a specific tree-ish (i.e. commit, tag or tree) to update the index for the given paths before updating the -working tree.</p> +working tree.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -q </dt> @@ -333,14 +381,14 @@ </dt> <dd> <p> - When creating a new branch, set up configuration so that <tt>git-pull</tt> + When creating a new branch, set up configuration so that <em>git-pull</em> will automatically retrieve data from the start point, which must be a branch. Use this if you always pull from the same upstream branch into the new branch, and if you don't want to use "git pull <repository> <refspec>" explicitly. This behavior is the default when the start point is a remote branch. Set the branch.autosetupmerge configuration variable to <tt>false</tt> if you want - <tt>git-checkout</tt> and <tt>git-branch</tt> to always behave as if <em>--no-track</em> were + <em>git-checkout</em> and <em>git-branch</em> to always behave as if <em>--no-track</em> were given. Set it to <tt>always</tt> if you want this behavior when the start-point is either a local or remote branch. </p> @@ -376,10 +424,10 @@ branch, your working tree contents, and the new branch is done, and you will be on the new branch. </p> -<p>When a merge conflict happens, the index entries for conflicting +<div class="para"><p>When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with <tt>git add</tt> (or <tt>git rm</tt> if the merge -should result in deletion of the path).</p> +should result in deletion of the path).</p></div> </dd> <dt> <new_branch> @@ -397,46 +445,46 @@ Branch to checkout; may be any object ID that resolves to a commit. Defaults to HEAD. </p> -<p>When this parameter names a non-branch (but still a valid commit object), -your HEAD becomes <em>detached</em>.</p> +<div class="para"><p>When this parameter names a non-branch (but still a valid commit object), +your HEAD becomes <em>detached</em>.</p></div> </dd> -</dl> +</dl></div> </div> -<h2>Detached HEAD</h2> +<h2 id="_detached_head">Detached HEAD</h2> <div class="sectionbody"> -<p>It is sometimes useful to be able to <em>checkout</em> a commit that is +<div class="para"><p>It is sometimes useful to be able to <em>checkout</em> a commit that is not at the tip of one of your branches. The most obvious example is to check out the commit at a tagged official release -point, like this:</p> +point, like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout v2.6.18</tt></pre> </div></div> -<p>Earlier versions of git did not allow this and asked you to +<div class="para"><p>Earlier versions of git did not allow this and asked you to create a temporary branch using <tt>-b</tt> option, but starting from version 1.5.0, the above command <em>detaches</em> your HEAD from the current branch and directly point at the commit named by the tag -(<tt>v2.6.18</tt> in the above example).</p> -<p>You can use usual git commands while in this state. You can use +(<tt>v2.6.18</tt> in the above example).</p></div> +<div class="para"><p>You can use usual git commands while in this state. You can use <tt>git reset --hard $othercommit</tt> to further move around, for example. You can make changes and create a new commit on top of a detached HEAD. You can even create a merge by using <tt>git -merge $othercommit</tt>.</p> -<p>The state you are in while your HEAD is detached is not recorded +merge $othercommit</tt>.</p></div> +<div class="para"><p>The state you are in while your HEAD is detached is not recorded by any branch (which is natural --- you are not on any branch). What this means is that you can discard your temporary commits and merges by switching back to an existing branch (e.g. <tt>git checkout master</tt>), and a later <tt>git prune</tt> or <tt>git gc</tt> would garbage-collect them. If you did this by mistake, you can ask -the reflog for HEAD where you were, e.g.</p> +the reflog for HEAD where you were, e.g.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log -g -2 HEAD</tt></pre> </div></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<ol> +<div class="olist"><ol> <li> <p> The following sequence checks out the <tt>master</tt> branch, reverts @@ -450,7 +498,7 @@ $ rm -f hello.c $ git checkout hello.c <b>(3)</b></tt></pre> </div></div> -<ol> +<div class="colist"><ol> <li> <p> switch branch @@ -465,15 +513,15 @@ <p> restore hello.c from HEAD of current branch </p> -<p>If you have an unfortunate branch that is named <tt>hello.c</tt>, this +<div class="para"><p>If you have an unfortunate branch that is named <tt>hello.c</tt>, this step would be confused as an instruction to switch to that branch. -You should instead write:</p> +You should instead write:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout -- hello.c</tt></pre> </div></div> </li> -</ol> +</ol></div> </li> <li> <p> @@ -484,24 +532,24 @@ <div class="content"> <pre><tt>$ git checkout mytopic</tt></pre> </div></div> -<p>However, your "wrong" branch and correct "mytopic" branch may +<div class="para"><p>However, your "wrong" branch and correct "mytopic" branch may differ in files that you have locally modified, in which case, -the above checkout would fail like this:</p> +the above checkout would fail like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout mytopic fatal: Entry 'frotz' not uptodate. Cannot merge.</tt></pre> </div></div> -<p>You can give the <tt>-m</tt> flag to the command, which would try a -three-way merge:</p> +<div class="para"><p>You can give the <tt>-m</tt> flag to the command, which would try a +three-way merge:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout -m mytopic Auto-merging frotz</tt></pre> </div></div> -<p>After this three-way merge, the local modifications are _not_ +<div class="para"><p>After this three-way merge, the local modifications are <em>not</em> registered in your index file, so <tt>git diff</tt> would show you what -changes you made since the tip of the new branch.</p> +changes you made since the tip of the new branch.</p></div> </li> <li> <p> @@ -516,33 +564,33 @@ ERROR: Merge conflict in frotz fatal: merge program failed</tt></pre> </div></div> -<p>At this point, <tt>git diff</tt> shows the changes cleanly merged as in +<div class="para"><p>At this point, <tt>git diff</tt> shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with -<tt>git add</tt> as usual:</p> +<tt>git add</tt> as usual:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ edit frotz $ git add frotz</tt></pre> </div></div> </li> -</ol> +</ol></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:34 UTC +Last updated 2008-07-06 05:16:37 UTC </div> </div> </body> diff --git a/git-checkout.txt b/git-checkout.txt index c0f9c6e..2abfbda 100644 --- a/git-checkout.txt +++ b/git-checkout.txt
@@ -49,14 +49,14 @@ -t:: --track:: - When creating a new branch, set up configuration so that `git-pull` + When creating a new branch, set up configuration so that 'git-pull' will automatically retrieve data from the start point, which must be a branch. Use this if you always pull from the same upstream branch into the new branch, and if you don't want to use "git pull <repository> <refspec>" explicitly. This behavior is the default when the start point is a remote branch. Set the branch.autosetupmerge configuration variable to `false` if you want - `git-checkout` and `git-branch` to always behave as if '--no-track' were + 'git-checkout' and 'git-branch' to always behave as if '--no-track' were given. Set it to `always` if you want this behavior when the start-point is either a local or remote branch.
diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 3dcec28..79e62bb 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-cherry-pick(1)</title> </head> @@ -272,17 +320,17 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] <commit></p> +<div class="para"><p><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] <commit></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Given one existing commit, apply the change the patch introduces, and record a +<div class="para"><p>Given one existing commit, apply the change the patch introduces, and record a new commit that records it. This requires your working tree to be clean (no -modifications from the HEAD commit).</p> +modifications from the HEAD commit).</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <commit> </dt> @@ -301,7 +349,7 @@ </dt> <dd> <p> - With this option, <tt>git-cherry-pick</tt> will let you edit the commit + With this option, <em>git-cherry-pick</em> will let you edit the commit message prior to committing. </p> </dd> @@ -365,8 +413,8 @@ the HEAD commit. The cherry-pick is done against the beginning state of your working tree. </p> -<p>This is useful when cherry-picking more than one commits' -effect to your working tree in a row.</p> +<div class="para"><p>This is useful when cherry-picking more than one commits' +effect to your working tree in a row.</p></div> </dd> <dt> -s @@ -379,23 +427,23 @@ Add Signed-off-by line at the end of the commit message. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:35 UTC +Last updated 2008-07-06 05:16:38 UTC </div> </div> </body> diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 1b864da..a691173 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt
@@ -24,7 +24,7 @@ -e:: --edit:: - With this option, `git-cherry-pick` will let you edit the commit + With this option, 'git-cherry-pick' will let you edit the commit message prior to committing. -x::
diff --git a/git-cherry.html b/git-cherry.html index aa6f084..1e6195d 100644 --- a/git-cherry.html +++ b/git-cherry.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-cherry(1)</title> </head> @@ -272,19 +320,19 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git cherry</em> [-v] <upstream> [<head>] [<limit>]</p> +<div class="para"><p><em>git cherry</em> [-v] <upstream> [<head>] [<limit>]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>The changeset (or "diff") of each commit between the fork-point and <head> +<div class="para"><p>The changeset (or "diff") of each commit between the fork-point and <head> is compared against each commit between the fork-point and <upstream>. The commits are compared with their <em>patch id</em>, obtained from -the <tt>git-patch-id</tt> program.</p> -<p>Every commit that doesn't exist in the <upstream> branch +the <em>git-patch-id</em> program.</p></div> +<div class="para"><p>Every commit that doesn't exist in the <upstream> branch has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already in the <upstream> branch are prefixed with a minus (-) sign, and those -that only exist in the <head> branch are prefixed with a plus (+) symbol:</p> +that only exist in the <head> branch are prefixed with a plus (+) symbol:</p></div> <div class="literalblock"> <div class="content"> <pre><tt> __*__*__*__*__> <upstream> @@ -292,8 +340,8 @@ fork-point \__+__+__-__+__+__-__+__> <head></tt></pre> </div></div> -<p>If a <limit> has been given then the commits along the <head> branch up -to and including <limit> are not reported:</p> +<div class="para"><p>If a <limit> has been given then the commits along the <head> branch up +to and including <limit> are not reported:</p></div> <div class="literalblock"> <div class="content"> <pre><tt> __*__*__*__*__> <upstream> @@ -301,15 +349,15 @@ fork-point \__*__*__<limit>__-__+__> <head></tt></pre> </div></div> -<p>Because <tt>git-cherry</tt> compares the changeset rather than the commit id -(sha1), you can use <tt>git-cherry</tt> to find out if a commit you made locally +<div class="para"><p>Because <em>git-cherry</em> compares the changeset rather than the commit id +(sha1), you can use <em>git-cherry</em> to find out if a commit you made locally has been applied <upstream> under a different commit id. For example, this will happen if you're feeding patches <upstream> via email rather -than pushing or pulling commits directly.</p> +than pushing or pulling commits directly.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -v </dt> @@ -342,27 +390,27 @@ Do not report commits up to (and including) limit. </p> </dd> -</dl> +</dl></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-patch-id.html">git-patch-id(1)</a></p> +<div class="para"><p><a href="git-patch-id.html">git-patch-id(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:35 UTC +Last updated 2008-07-06 05:16:38 UTC </div> </div> </body> diff --git a/git-cherry.txt b/git-cherry.txt index 9859bc8..d761a73 100644 --- a/git-cherry.txt +++ b/git-cherry.txt
@@ -14,7 +14,7 @@ The changeset (or "diff") of each commit between the fork-point and <head> is compared against each commit between the fork-point and <upstream>. The commits are compared with their 'patch id', obtained from -the `git-patch-id` program. +the 'git-patch-id' program. Every commit that doesn't exist in the <upstream> branch has its id (sha1) reported, prefixed by a symbol. The ones that have @@ -37,8 +37,8 @@ \__*__*__<limit>__-__+__> <head> -Because `git-cherry` compares the changeset rather than the commit id -(sha1), you can use `git-cherry` to find out if a commit you made locally +Because 'git-cherry' compares the changeset rather than the commit id +(sha1), you can use 'git-cherry' to find out if a commit you made locally has been applied <upstream> under a different commit id. For example, this will happen if you're feeding patches <upstream> via email rather than pushing or pulling commits directly.
diff --git a/git-citool.html b/git-citool.html index 75c8227..812b400 100644 --- a/git-citool.html +++ b/git-citool.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-citool(1)</title> </head> @@ -272,32 +320,32 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git citool</em></p> +<div class="para"><p><em>git citool</em></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>A Tcl/Tk based graphical interface to review modified files, stage +<div class="para"><p>A Tcl/Tk based graphical interface to review modified files, stage them into the index, enter a commit message and record the new commit onto the current branch. This interface is an alternative -to the less interactive <tt>git-commit</tt> program.</p> -<p><tt>git-citool</tt> is actually a standard alias for <tt>git gui citool</tt>. -See <a href="git-gui.html">git-gui(1)</a> for more details.</p> +to the less interactive <em>git-commit</em> program.</p></div> +<div class="para"><p><em>git-citool</em> is actually a standard alias for <tt>git gui citool</tt>. +See <a href="git-gui.html">git-gui(1)</a> for more details.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Shawn O. Pearce <spearce@spearce.org>.</p> +<div class="para"><p>Written by Shawn O. Pearce <spearce@spearce.org>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Shawn O. Pearce <spearce@spearce.org>.</p> +<div class="para"><p>Documentation by Shawn O. Pearce <spearce@spearce.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:35 UTC +Last updated 2008-07-06 05:16:38 UTC </div> </div> </body> diff --git a/git-citool.txt b/git-citool.txt index 8e6c7e6..670cb02 100644 --- a/git-citool.txt +++ b/git-citool.txt
@@ -14,9 +14,9 @@ A Tcl/Tk based graphical interface to review modified files, stage them into the index, enter a commit message and record the new commit onto the current branch. This interface is an alternative -to the less interactive `git-commit` program. +to the less interactive 'git-commit' program. -`git-citool` is actually a standard alias for `git gui citool`. +'git-citool' is actually a standard alias for `git gui citool`. See linkgit:git-gui[1] for more details. Author
diff --git a/git-clean.html b/git-clean.html index bef7d11..0fc3e0c 100644 --- a/git-clean.html +++ b/git-clean.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-clean(1)</title> </head> @@ -275,18 +323,18 @@ <div class="verseblock"> <div class="content"><em>git clean</em> [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>…</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Removes files unknown to git. This allows to clean the working tree +<div class="para"><p>Removes files unknown to git. This allows to clean the working tree from files that are not under version control. If the <em>-x</em> option is specified, ignored files are also removed, allowing to remove all build products. When optional <tt><paths>…</tt> arguments are given, the paths -affected are further limited to those that match them.</p> +affected are further limited to those that match them.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -d </dt> @@ -301,7 +349,7 @@ <dd> <p> If the git configuration specifies clean.requireForce as true, - <tt>git-clean</tt> will refuse to run unless given -f or -n. + <em>git-clean</em> will refuse to run unless given -f or -n. </p> </dd> <dt> @@ -334,7 +382,7 @@ <p> Don't use the ignore rules. This allows removing all untracked files, including build products. This can be used (possibly in - conjunction with <tt>git-reset</tt>) to create a pristine + conjunction with <em>git-reset</em>) to create a pristine working directory to test a clean build. </p> </dd> @@ -347,19 +395,19 @@ everything from scratch, but keep manually created files. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Pavel Roskin <proski@gnu.org></p> +<div class="para"><p>Written by Pavel Roskin <proski@gnu.org></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:36 UTC +Last updated 2008-07-06 05:16:38 UTC </div> </div> </body> diff --git a/git-clean.txt b/git-clean.txt index 8168bf3..7dcc1ba 100644 --- a/git-clean.txt +++ b/git-clean.txt
@@ -27,7 +27,7 @@ -f:: If the git configuration specifies clean.requireForce as true, - `git-clean` will refuse to run unless given -f or -n. + 'git-clean' will refuse to run unless given -f or -n. -n:: --dry-run:: @@ -41,7 +41,7 @@ -x:: Don't use the ignore rules. This allows removing all untracked files, including build products. This can be used (possibly in - conjunction with `git-reset`) to create a pristine + conjunction with 'git-reset') to create a pristine working directory to test a clean build. -X::
diff --git a/git-clone.html b/git-clone.html index 37bd14d..4b8ba1d 100644 --- a/git-clone.html +++ b/git-clone.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-clone(1)</title> </head> @@ -278,24 +326,24 @@ [-o <name>] [-u <upload-pack>] [--reference <repository>] [--depth <depth>] [--] <repository> [<directory>]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Clones a repository into a newly created directory, creates +<div class="para"><p>Clones a repository into a newly created directory, creates remote-tracking branches for each branch in the cloned repository (visible using <tt>git branch -r</tt>), and creates and checks out an initial -branch equal to the cloned repository's currently active branch.</p> -<p>After the clone, a plain <tt>git fetch</tt> without arguments will update +branch equal to the cloned repository's currently active branch.</p></div> +<div class="para"><p>After the clone, a plain <tt>git fetch</tt> without arguments will update all the remote-tracking branches, and a <tt>git pull</tt> without arguments will in addition merge the remote master branch into the -current master branch, if any.</p> -<p>This default configuration is achieved by creating references to +current master branch, if any.</p></div> +<div class="para"><p>This default configuration is achieved by creating references to the remote branch heads under <tt>$GIT_DIR/refs/remotes/origin</tt> and by initializing <tt>remote.origin.url</tt> and <tt>remote.origin.fetch</tt> -configuration variables.</p> +configuration variables.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --local </dt> @@ -342,15 +390,15 @@ with the source repository. The resulting repository starts out without any object of its own. </p> -<p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use +<div class="para"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use it unless you understand what it does. If you clone your repository using this option and then delete branches (or use any other git command that makes any existing commit unreferenced) in the source repository, some objects may become unreferenced (or dangling). -These objects may be removed by normal git operations (such as <tt>git-commit</tt>) +These objects may be removed by normal git operations (such as <em>git-commit</em>) which automatically call <tt>git gc --auto</tt>. (See <a href="git-gc.html">git-gc(1)</a>.) If these objects are removed and were referenced by the cloned repository, -then the cloned repository will become corrupt.</p> +then the cloned repository will become corrupt.</p></div> </dd> <dt> --reference <repository> @@ -364,7 +412,7 @@ require fewer objects to be copied from the repository being cloned, reducing network and local storage costs. </p> -<p><strong>NOTE</strong>: see NOTE to --shared option.</p> +<div class="para"><p><strong>NOTE</strong>: see NOTE to --shared option.</p></div> </dd> <dt> --quiet @@ -375,7 +423,7 @@ <dd> <p> Operate quietly. This flag is passed to "rsync" and - <tt>git-fetch-pack</tt> commands when given. + <em>git-fetch-pack</em> commands when given. </p> </dd> <dt> @@ -427,7 +475,7 @@ <dd> <p> When given, and the repository to clone from is handled - by <tt>git-fetch-pack</tt>, <tt>--exec=<upload-pack></tt> is passed to + by <em>git-fetch-pack</em>, <tt>--exec=<upload-pack></tt> is passed to the command to specify non-default path for the command run on the other end. </p> @@ -478,15 +526,15 @@ is not allowed. </p> </dd> -</dl> +</dl></div> </div> -<h2>GIT URLS<a id="URLS"></a></h2> +<h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2> <div class="sectionbody"> -<p>One of the following notations can be used -to name the remote repository:</p> +<div class="para"><p>One of the following notations can be used +to name the remote repository:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> -<ul> +<div class="ilist"><ul> <li> <p> rsync://host.xz/path/to/repo.git/ @@ -532,17 +580,17 @@ ssh://[user@]host.xz/~/path/to/repo.git </p> </li> -</ul> +</ul></div> </div></div> -<p>SSH is the default transport protocol over the network. You can +<div class="para"><p>SSH is the default transport protocol over the network. You can optionally specify which user to log-in as, and an alternate, scp-like syntax is also supported. Both syntaxes support username expansion, as does the native git protocol, but only the former supports port specification. The following -three are identical to the last three above, respectively:</p> +three are identical to the last three above, respectively:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> -<ul> +<div class="ilist"><ul> <li> <p> [user@]host.xz:/path/to/repo.git/ @@ -558,12 +606,12 @@ [user@]host.xz:path/to/repo.git </p> </li> -</ul> +</ul></div> </div></div> -<p>To sync with a local directory, you can use:</p> +<div class="para"><p>To sync with a local directory, you can use:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> -<ul> +<div class="ilist"><ul> <li> <p> /path/to/repo.git/ @@ -574,31 +622,31 @@ file:///path/to/repo.git/ </p> </li> -</ul> +</ul></div> </div></div> -<p>They are equivalent, except the former implies --local option.</p> -<p>If there are a large number of similarly-named remote repositories and +<div class="para"><p>They are equivalent, except the former implies --local option.</p></div> +<div class="para"><p>If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a -configuration section of the form:</p> +configuration section of the form:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [url "<actual url base>"] insteadOf = <other url base></tt></pre> </div></div> -<p>For example, with this:</p> +<div class="para"><p>For example, with this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [url "git://git.host.xz/"] insteadOf = host.xz:/path/to/ insteadOf = work:</tt></pre> </div></div> -<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be -rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p> +<div class="para"><p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p></div> </div> -<h2>Examples</h2> +<h2 id="_examples">Examples</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> Clone from upstream </dt> @@ -652,23 +700,23 @@ /pub/scm/.../me/subsys-2.6.git</tt></pre> </div></div> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:36 UTC +Last updated 2008-07-06 05:16:38 UTC </div> </div> </body> diff --git a/git-clone.txt b/git-clone.txt index eef95a4..91efac9 100644 --- a/git-clone.txt +++ b/git-clone.txt
@@ -68,7 +68,7 @@ repository using this option and then delete branches (or use any other git command that makes any existing commit unreferenced) in the source repository, some objects may become unreferenced (or dangling). -These objects may be removed by normal git operations (such as `git-commit`) +These objects may be removed by normal git operations (such as 'git-commit') which automatically call `git gc --auto`. (See linkgit:git-gc[1].) If these objects are removed and were referenced by the cloned repository, then the cloned repository will become corrupt. @@ -88,7 +88,7 @@ --quiet:: -q:: Operate quietly. This flag is passed to "rsync" and - `git-fetch-pack` commands when given. + 'git-fetch-pack' commands when given. --no-checkout:: -n:: @@ -114,7 +114,7 @@ --upload-pack <upload-pack>:: -u <upload-pack>:: When given, and the repository to clone from is handled - by `git-fetch-pack`, `--exec=<upload-pack>` is passed to + by 'git-fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end.
diff --git a/git-commit-tree.html b/git-commit-tree.html index 0e53726..1f832df 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-commit-tree(1)</title> </head> @@ -272,30 +320,30 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git commit-tree</em> <tree> [-p <parent commit>]* < changelog</p> +<div class="para"><p><em>git commit-tree</em> <tree> [-p <parent commit>]* < changelog</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This is usually not what an end user wants to run directly. See -<a href="git-commit.html">git-commit(1)</a> instead.</p> -<p>Creates a new commit object based on the provided tree object and +<div class="para"><p>This is usually not what an end user wants to run directly. See +<a href="git-commit.html">git-commit(1)</a> instead.</p></div> +<div class="para"><p>Creates a new commit object based on the provided tree object and emits the new commit object id on stdout. If no parent is given then -it is considered to be an initial tree.</p> -<p>A commit object usually has 1 parent (a commit after a change) or up +it is considered to be an initial tree.</p></div> +<div class="para"><p>A commit object usually has 1 parent (a commit after a change) or up to 16 parents. More than one parent represents a merge of branches -that led to them.</p> -<p>While a tree represents a particular directory state of a working +that led to them.</p></div> +<div class="para"><p>While a tree represents a particular directory state of a working directory, a commit represents that state in "time", and explains how -to get there.</p> -<p>Normally a commit would identify a new "HEAD" state, and while git +to get there.</p></div> +<div class="para"><p>Normally a commit would identify a new "HEAD" state, and while git doesn't care where you save the note about that state, in practice we tend to just write the result to the file that is pointed at by <tt>.git/HEAD</tt>, so that we can always see what the last committed -state was.</p> +state was.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <tree> </dt> @@ -312,12 +360,12 @@ Each <em>-p</em> indicates the id of a parent commit object. </p> </dd> -</dl> +</dl></div> </div> -<h2>Commit Information</h2> +<h2 id="_commit_information">Commit Information</h2> <div class="sectionbody"> -<p>A commit encapsulates:</p> -<ul> +<div class="para"><p>A commit encapsulates:</p></div> +<div class="ilist"><ul> <li> <p> all parent object ids @@ -333,10 +381,10 @@ committer name and email and the commit time. </p> </li> -</ul> -<p>While parent object ids are provided on the command line, author and +</ul></div> +<div class="para"><p>While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, -if set:</p> +if set:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>GIT_AUTHOR_NAME @@ -347,17 +395,17 @@ GIT_COMMITTER_DATE EMAIL</tt></pre> </div></div> -<p>(nb "<", ">" and "\n"s are stripped)</p> -<p>In case (some of) these environment variables are not set, the information +<div class="para"><p>(nb "<", ">" and "\n"s are stripped)</p></div> +<div class="para"><p>In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not -present, system user name and fully qualified hostname.</p> -<p>A commit comment is read from stdin. If a changelog -entry is not provided via "<" redirection, <tt>git-commit-tree</tt> will just wait -for one to be entered and terminated with ^D.</p> +present, system user name and fully qualified hostname.</p></div> +<div class="para"><p>A commit comment is read from stdin. If a changelog +entry is not provided via "<" redirection, <em>git-commit-tree</em> will just wait +for one to be entered and terminated with ^D.</p></div> </div> -<h2>Diagnostics</h2> +<h2 id="_diagnostics">Diagnostics</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> You don't exist. Go away! </dt> @@ -382,12 +430,12 @@ The password(5) name field is longer than a giant static buffer. </p> </dd> -</dl> +</dl></div> </div> -<h2>Discussion</h2> +<h2 id="_discussion">Discussion</h2> <div class="sectionbody"> -<p>At the core level, git is character encoding agnostic.</p> -<ul> +<div class="para"><p>At the core level, git is character encoding agnostic.</p></div> +<div class="ilist"><ul> <li> <p> The pathnames recorded in the index and in the tree objects @@ -411,17 +459,17 @@ bytes. </p> </li> -</ul> -<p>Although we encourage that the commit log messages are encoded +</ul></div> +<div class="para"><p>Although we encourage that the commit log messages are encoded in UTF-8, both the core and git Porcelain are designed not to force UTF-8 on projects. If all participants of a particular project find it more convenient to use legacy encodings, git does not forbid it. However, there are a few things to keep in -mind.</p> -<ol> +mind.</p></div> +<div class="olist"><ol> <li> <p> -<tt>git-commit-tree</tt> (hence, <tt>git-commit</tt> which uses it) issues +<em>git-commit-tree</em> (hence, <em>git-commit</em> which uses it) issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to @@ -432,14 +480,14 @@ <pre><tt>[i18n] commitencoding = ISO-8859-1</tt></pre> </div></div> -<p>Commit objects created with the above setting record the value +<div class="para"><p>Commit objects created with the above setting record the value of <tt>i18n.commitencoding</tt> in its <tt>encoding</tt> header. This is to help other people who look at them later. Lack of this header -implies that the commit log message is encoded in UTF-8.</p> +implies that the commit log message is encoded in UTF-8.</p></div> </li> <li> <p> -<tt>git-log</tt>, <tt>git-show</tt> and friends looks at the <tt>encoding</tt> +<em>git-log</em>, <em>git-show</em> and friends looks at the <tt>encoding</tt> header of a commit object, and tries to re-code the log message into UTF-8 unless otherwise specified. You can specify the desired output encoding with @@ -450,34 +498,34 @@ <pre><tt>[i18n] logoutputencoding = ISO-8859-1</tt></pre> </div></div> -<p>If you do not have this configuration variable, the value of -<tt>i18n.commitencoding</tt> is used instead.</p> +<div class="para"><p>If you do not have this configuration variable, the value of +<tt>i18n.commitencoding</tt> is used instead.</p></div> </li> -</ol> -<p>Note that we deliberately chose not to re-code the commit log +</ol></div> +<div class="para"><p>Note that we deliberately chose not to re-code the commit log message when a commit is made to force UTF-8 at the commit object level, because re-coding to UTF-8 is not necessarily a -reversible operation.</p> +reversible operation.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-write-tree.html">git-write-tree(1)</a></p> +<div class="para"><p><a href="git-write-tree.html">git-write-tree(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:36 UTC +Last updated 2008-07-06 05:16:39 UTC </div> </div> </body> diff --git a/git-commit-tree.txt b/git-commit-tree.txt index 9cd8d07..feec584 100644 --- a/git-commit-tree.txt +++ b/git-commit-tree.txt
@@ -70,7 +70,7 @@ present, system user name and fully qualified hostname. A commit comment is read from stdin. If a changelog -entry is not provided via "<" redirection, `git-commit-tree` will just wait +entry is not provided via "<" redirection, 'git-commit-tree' will just wait for one to be entered and terminated with ^D.
diff --git a/git-commit.html b/git-commit.html index 696c0cb..e18732a 100644 --- a/git-commit.html +++ b/git-commit.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-commit(1)</title> </head> @@ -278,22 +326,22 @@ [--allow-empty] [--no-verify] [-e] [--author=<author>] [--cleanup=<mode>] [--] [[-i | -o ]<file>…]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Use <em>git commit</em> to store the current contents of the index in a new -commit along with a log message describing the changes you have made.</p> -<p>The content to be added can be specified in several ways:</p> -<ol> +<div class="para"><p>Stores the current contents of the index in a new commit along +with a log message from the user describing the changes.</p></div> +<div class="para"><p>The content to be added can be specified in several ways:</p></div> +<div class="olist"><ol> <li> <p> -by using <tt>git-add</tt> to incrementally "add" changes to the +by using <em>git-add</em> to incrementally "add" changes to the index before using the <em>commit</em> command (Note: even modified files must be "added"); </p> </li> <li> <p> -by using <tt>git-rm</tt> to remove files from the working tree +by using <em>git-rm</em> to remove files from the working tree and the index, again before using the <em>commit</em> command; </p> </li> @@ -317,20 +365,20 @@ <p> by using the --interactive switch with the <em>commit</em> command to decide one by one which files should be part of the commit, before finalizing the - operation. Currently, this is done by invoking <tt>git-add --interactive</tt>. + operation. Currently, this is done by invoking <em>git-add --interactive</em>. </p> </li> -</ol> -<p>The <tt>git-status</tt> command can be used to obtain a +</ol></div> +<div class="para"><p>The <em>git-status</em> command can be used to obtain a summary of what is included by any of the above for the next commit by giving the same set of parameters you would give to -this command.</p> -<p>If you make a commit and then find a mistake immediately after -that, you can recover from it with <tt>git-reset</tt>.</p> +this command.</p></div> +<div class="para"><p>If you make a commit and then find a mistake immediately after +that, you can recover from it with <em>git-reset</em>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -a </dt> @@ -493,7 +541,7 @@ the current tip as parents — so the current top commit is discarded. </p> -<p>It is a rough equivalent for:</p> +<div class="para"><p>It is a rough equivalent for:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git reset --soft HEAD^ @@ -501,7 +549,7 @@ $ git commit -c ORIG_HEAD </tt></pre> </div></div> -<p>but can be used to amend a merge commit.</p> +<div class="para"><p>but can be used to amend a merge commit.</p></div> </dd> <dt> -i @@ -528,7 +576,7 @@ Make a commit only from the paths specified on the command line, disregarding any contents that have been staged so far. This is the default mode of operation of - <em>git commit</em> if any paths are given on the command line, + <em>git-commit</em> if any paths are given on the command line, in which case this option can be omitted. If this option is specified together with <em>--amend</em>, then no paths need be specified, which can be used to amend @@ -546,9 +594,9 @@ <p> Show untracked files (Default: <em>all</em>). </p> -<p>The mode parameter is optional, and is used to specify -the handling of untracked files. The possible options are:</p> -<ul> +<div class="para"><p>The mode parameter is optional, and is used to specify +the handling of untracked files. The possible options are:</p></div> +<div class="ilist"><ul> <li> <p> <em>no</em> - Show no untracked files @@ -564,10 +612,10 @@ <em>all</em> - Also shows individual files in untracked directories. </p> </li> -</ul> -<p>See <a href="git-config.html">git-config(1)</a> for configuration variable +</ul></div> +<div class="para"><p>See <a href="git-config.html">git-config(1)</a> for configuration variable used to change the default for when the option is not -specified.</p> +specified.</p></div> </dd> <dt> -v @@ -614,21 +662,21 @@ of what have been staged before. </p> </dd> -</dl> +</dl></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<p>When recording your own work, the contents of modified files in +<div class="para"><p>When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area -called the "index" with <tt>git-add</tt>. A file can be +called the "index" with <em>git-add</em>. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with <tt>git reset HEAD — <file></tt>, -which effectively reverts <tt>git-add</tt> and prevents the changes to +which effectively reverts <em>git-add</em> and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, <tt>git commit</tt> (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the -command. An example:</p> +command. An example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ edit hello.c @@ -636,25 +684,25 @@ $ git add hello.c $ git commit</tt></pre> </div></div> -<p>Instead of staging files after each individual change, you can +<div class="para"><p>Instead of staging files after each individual change, you can tell <tt>git commit</tt> to notice the changes to the files whose contents are tracked in your working tree and do corresponding <tt>git add</tt> and <tt>git rm</tt> for you. That is, this example does the same as the earlier -example if there is no other change in your working tree:</p> +example if there is no other change in your working tree:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ edit hello.c $ rm goodbye.c $ git commit -a</tt></pre> </div></div> -<p>The command <tt>git commit -a</tt> first looks at your working tree, +<div class="para"><p>The command <tt>git commit -a</tt> first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, -and performs necessary <tt>git add</tt> and <tt>git rm</tt> for you.</p> -<p>After staging changes to many files, you can alter the order the +and performs necessary <tt>git add</tt> and <tt>git rm</tt> for you.</p></div> +<div class="para"><p>After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to <tt>git commit</tt>. When pathnames are given, the command makes a commit that -only records the changes made to the named paths:</p> +only records the changes made to the named paths:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ edit hello.c hello.h @@ -662,24 +710,24 @@ $ edit Makefile $ git commit Makefile</tt></pre> </div></div> -<p>This makes a commit that records the modification to <tt>Makefile</tt>. +<div class="para"><p>This makes a commit that records the modification to <tt>Makefile</tt>. The changes staged for <tt>hello.c</tt> and <tt>hello.h</tt> are not included in the resulting commit. However, their changes are not lost — they are still staged and merely held back. After the above -sequence, if you do:</p> +sequence, if you do:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git commit</tt></pre> </div></div> -<p>this second commit would record the changes to <tt>hello.c</tt> and -<tt>hello.h</tt> as expected.</p> -<p>After a merge (initiated by <tt>git-merge</tt> or <tt>git-pull</tt>) stops +<div class="para"><p>this second commit would record the changes to <tt>hello.c</tt> and +<tt>hello.h</tt> as expected.</p></div> +<div class="para"><p>After a merge (initiated by <em>git-merge</em> or <em>git-pull</em>) stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first -check which paths are conflicting with <tt>git-status</tt> +check which paths are conflicting with <em>git-status</em> and after fixing them manually in your working tree, you would -stage the result as usual with <tt>git-add</tt>:</p> +stage the result as usual with <em>git-add</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git status | grep unmerged @@ -687,29 +735,29 @@ $ edit hello.c $ git add hello.c</tt></pre> </div></div> -<p>After resolving conflicts and staging the result, <tt>git ls-files -u</tt> +<div class="para"><p>After resolving conflicts and staging the result, <tt>git ls-files -u</tt> would stop mentioning the conflicted path. When you are done, -run <tt>git commit</tt> to finally record the merge:</p> +run <tt>git commit</tt> to finally record the merge:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git commit</tt></pre> </div></div> -<p>As with the case to record your own changes, you can use <tt>-a</tt> +<div class="para"><p>As with the case to record your own changes, you can use <tt>-a</tt> option to save typing. One difference is that during a merge resolution, you cannot use <tt>git commit</tt> with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command -refuses to run when given pathnames (but see <tt>-i</tt> option).</p> +refuses to run when given pathnames (but see <tt>-i</tt> option).</p></div> </div> -<h2>DISCUSSION</h2> +<h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> -<p>Though not required, it's a good idea to begin the commit message +<div class="para"><p>Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. Tools that turn commits into email, for example, use the first line -on the Subject: line and the rest of the commit in the body.</p> -<p>At the core level, git is character encoding agnostic.</p> -<ul> +on the Subject: line and the rest of the commit in the body.</p></div> +<div class="para"><p>At the core level, git is character encoding agnostic.</p></div> +<div class="ilist"><ul> <li> <p> The pathnames recorded in the index and in the tree objects @@ -733,17 +781,17 @@ bytes. </p> </li> -</ul> -<p>Although we encourage that the commit log messages are encoded +</ul></div> +<div class="para"><p>Although we encourage that the commit log messages are encoded in UTF-8, both the core and git Porcelain are designed not to force UTF-8 on projects. If all participants of a particular project find it more convenient to use legacy encodings, git does not forbid it. However, there are a few things to keep in -mind.</p> -<ol> +mind.</p></div> +<div class="olist"><ol> <li> <p> -<tt>git-commit-tree</tt> (hence, <tt>git-commit</tt> which uses it) issues +<em>git-commit-tree</em> (hence, <em>git-commit</em> which uses it) issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to @@ -754,14 +802,14 @@ <pre><tt>[i18n] commitencoding = ISO-8859-1</tt></pre> </div></div> -<p>Commit objects created with the above setting record the value +<div class="para"><p>Commit objects created with the above setting record the value of <tt>i18n.commitencoding</tt> in its <tt>encoding</tt> header. This is to help other people who look at them later. Lack of this header -implies that the commit log message is encoded in UTF-8.</p> +implies that the commit log message is encoded in UTF-8.</p></div> </li> <li> <p> -<tt>git-log</tt>, <tt>git-show</tt> and friends looks at the <tt>encoding</tt> +<em>git-log</em>, <em>git-show</em> and friends looks at the <tt>encoding</tt> header of a commit object, and tries to re-code the log message into UTF-8 unless otherwise specified. You can specify the desired output encoding with @@ -772,48 +820,48 @@ <pre><tt>[i18n] logoutputencoding = ISO-8859-1</tt></pre> </div></div> -<p>If you do not have this configuration variable, the value of -<tt>i18n.commitencoding</tt> is used instead.</p> +<div class="para"><p>If you do not have this configuration variable, the value of +<tt>i18n.commitencoding</tt> is used instead.</p></div> </li> -</ol> -<p>Note that we deliberately chose not to re-code the commit log +</ol></div> +<div class="para"><p>Note that we deliberately chose not to re-code the commit log message when a commit is made to force UTF-8 at the commit object level, because re-coding to UTF-8 is not necessarily a -reversible operation.</p> +reversible operation.</p></div> </div> -<h2>ENVIRONMENT AND CONFIGURATION VARIABLES</h2> +<h2 id="_environment_and_configuration_variables">ENVIRONMENT AND CONFIGURATION VARIABLES</h2> <div class="sectionbody"> -<p>The editor used to edit the commit log message will be chosen from the +<div class="para"><p>The editor used to edit the commit log message will be chosen from the GIT_EDITOR environment variable, the core.editor configuration variable, the VISUAL environment variable, or the EDITOR environment variable (in that -order).</p> +order).</p></div> </div> -<h2>HOOKS</h2> +<h2 id="_hooks">HOOKS</h2> <div class="sectionbody"> -<p>This command can run <tt>commit-msg</tt>, <tt>prepare-commit-msg</tt>, <tt>pre-commit</tt>, +<div class="para"><p>This command can run <tt>commit-msg</tt>, <tt>prepare-commit-msg</tt>, <tt>pre-commit</tt>, and <tt>post-commit</tt> hooks. See <a href="githooks.html">githooks(5)</a> for more -information.</p> +information.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-add.html">git-add(1)</a>, +<div class="para"><p><a href="git-add.html">git-add(1)</a>, <a href="git-rm.html">git-rm(1)</a>, <a href="git-mv.html">git-mv(1)</a>, <a href="git-merge.html">git-merge(1)</a>, -<a href="git-commit-tree.html">git-commit-tree(1)</a></p> +<a href="git-commit-tree.html">git-commit-tree(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and +Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:36 UTC +Last updated 2008-07-06 05:16:39 UTC </div> </div> </body> diff --git a/git-commit.txt b/git-commit.txt index 03594cd..01bd2d6 100644 --- a/git-commit.txt +++ b/git-commit.txt
@@ -15,16 +15,16 @@ DESCRIPTION ----------- -Use 'git commit' to store the current contents of the index in a new -commit along with a log message describing the changes you have made. +Stores the current contents of the index in a new commit along +with a log message from the user describing the changes. The content to be added can be specified in several ways: -1. by using `git-add` to incrementally "add" changes to the +1. by using 'git-add' to incrementally "add" changes to the index before using the 'commit' command (Note: even modified files must be "added"); -2. by using `git-rm` to remove files from the working tree +2. by using 'git-rm' to remove files from the working tree and the index, again before using the 'commit' command; 3. by listing files as arguments to the 'commit' command, in which @@ -39,15 +39,15 @@ 5. by using the --interactive switch with the 'commit' command to decide one by one which files should be part of the commit, before finalizing the - operation. Currently, this is done by invoking `git-add --interactive`. + operation. Currently, this is done by invoking 'git-add --interactive'. -The `git-status` command can be used to obtain a +The 'git-status' command can be used to obtain a summary of what is included by any of the above for the next commit by giving the same set of parameters you would give to this command. If you make a commit and then find a mistake immediately after -that, you can recover from it with `git-reset`. +that, you can recover from it with 'git-reset'. OPTIONS @@ -155,7 +155,7 @@ Make a commit only from the paths specified on the command line, disregarding any contents that have been staged so far. This is the default mode of operation of - 'git commit' if any paths are given on the command line, + 'git-commit' if any paths are given on the command line, in which case this option can be omitted. If this option is specified together with '--amend', then no paths need be specified, which can be used to amend @@ -205,10 +205,10 @@ -------- When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area -called the "index" with `git-add`. A file can be +called the "index" with 'git-add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git reset HEAD -- <file>`, -which effectively reverts `git-add` and prevents the changes to +which effectively reverts 'git-add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what @@ -264,13 +264,13 @@ this second commit would record the changes to `hello.c` and `hello.h` as expected. -After a merge (initiated by `git-merge` or `git-pull`) stops +After a merge (initiated by 'git-merge' or 'git-pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first -check which paths are conflicting with `git-status` +check which paths are conflicting with 'git-status' and after fixing them manually in your working tree, you would -stage the result as usual with `git-add`: +stage the result as usual with 'git-add': ------------ $ git status | grep unmerged
diff --git a/git-config.html b/git-config.html index d2df6d3..ad33cf1 100644 --- a/git-config.html +++ b/git-config.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-config(1)</title> </head> @@ -287,29 +335,29 @@ <em>git config</em> [<file-option>] --get-color name [default] <em>git config</em> [<file-option>] --get-colorbool name [stdout-is-tty]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>You can query/set/replace/unset options with this command. The name is +<div class="para"><p>You can query/set/replace/unset options with this command. The name is actually the section and the key separated by a dot, and the value will be -escaped.</p> -<p>Multiple lines can be added to an option by using the <em>--add</em> option. +escaped.</p></div> +<div class="para"><p>Multiple lines can be added to an option by using the <em>--add</em> option. If you want to update or unset an option which can occur on multiple lines, a POSIX regexp <tt>value_regex</tt> needs to be given. Only the existing values that match the regexp are updated or unset. If you want to handle the lines that do <strong>not</strong> match the regex, just -prepend a single exclamation mark in front (see also <a href="#EXAMPLES">[EXAMPLES]</a>).</p> -<p>The type specifier can be either <em>--int</em> or <em>--bool</em>, which will make -<tt>git-config</tt> ensure that the variable(s) are of the given type and +prepend a single exclamation mark in front (see also <a href="#EXAMPLES">[EXAMPLES]</a>).</p></div> +<div class="para"><p>The type specifier can be either <em>--int</em> or <em>--bool</em>, which will make +<em>git-config</em> ensure that the variable(s) are of the given type and convert the value to the canonical form (simple decimal number for int, a "true" or "false" string for bool). If no type specifier is passed, -no checks or transformations are performed on the value.</p> -<p>The file-option can be one of <em>--system</em>, <em>--global</em> or <em>--file</em> +no checks or transformations are performed on the value.</p></div> +<div class="para"><p>The file-option can be one of <em>--system</em>, <em>--global</em> or <em>--file</em> which specify where the values will be read from or written to. The default is to assume the config file of the current repository, .git/config unless defined otherwise with GIT_DIR and GIT_CONFIG -(see <a href="#FILES">[FILES]</a>).</p> -<p>This command will fail if:</p> -<ol> +(see <a href="#FILES">[FILES]</a>).</p></div> +<div class="para"><p>This command will fail if:</p></div> +<div class="olist"><ol> <li> <p> The config file is invalid, @@ -345,11 +393,11 @@ you use <em>--global</em> option without $HOME being properly set. </p> </li> -</ol> +</ol></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --replace-all </dt> @@ -404,9 +452,9 @@ For writing options: write to global ~/.gitconfig file rather than the repository .git/config. </p> -<p>For reading options: read only from global ~/.gitconfig rather than -from all available files.</p> -<p>See also <a href="#FILES">[FILES]</a>.</p> +<div class="para"><p>For reading options: read only from global ~/.gitconfig rather than +from all available files.</p></div> +<div class="para"><p>See also <a href="#FILES">[FILES]</a>.</p></div> </dd> <dt> --system @@ -416,9 +464,9 @@ For writing options: write to system-wide $(prefix)/etc/gitconfig rather than the repository .git/config. </p> -<p>For reading options: read only from system-wide $(prefix)/etc/gitconfig -rather than from all available files.</p> -<p>See also <a href="#FILES">[FILES]</a>.</p> +<div class="para"><p>For reading options: read only from system-wide $(prefix)/etc/gitconfig +rather than from all available files.</p></div> +<div class="para"><p>See also <a href="#FILES">[FILES]</a>.</p></div> </dd> <dt> -f config-file @@ -479,7 +527,7 @@ </dt> <dd> <p> - <tt>git-config</tt> will ensure that the output is "true" or "false" + <em>git-config</em> will ensure that the output is "true" or "false" </p> </dd> <dt> @@ -487,7 +535,7 @@ </dt> <dd> <p> - <tt>git-config</tt> will ensure that the output is a simple + <em>git-config</em> will ensure that the output is a simple decimal number. An optional value suffix of <em>k</em>, <em>m</em>, or <em>g</em> in the config file will cause the value to be multiplied by 1024, 1048576, or 1073741824 prior to output. @@ -535,13 +583,13 @@ there is no color configured for <tt>name</tt>. </p> </dd> -</dl> +</dl></div> </div> -<h2><a id="FILES"></a>FILES</h2> +<h2 id="FILES">FILES</h2> <div class="sectionbody"> -<p>If not set explicitly with <em>--file</em>, there are three files where -<tt>git-config</tt> will search for configuration options:</p> -<dl> +<div class="para"><p>If not set explicitly with <em>--file</em>, there are three files where +<em>git-config</em> will search for configuration options:</p></div> +<div class="vlist"><dl> <dt> $GIT_DIR/config </dt> @@ -569,27 +617,27 @@ System-wide configuration file. </p> </dd> -</dl> -<p>If no further options are given, all reading options will read all of these +</dl></div> +<div class="para"><p>If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration -file is not available or readable, <tt>git-config</tt> will exit with a non-zero -error code. However, in neither case will an error message be issued.</p> -<p>All writing options will per default write to the repository specific +file is not available or readable, <em>git-config</em> will exit with a non-zero +error code. However, in neither case will an error message be issued.</p></div> +<div class="para"><p>All writing options will per default write to the repository specific configuration file. Note that this also affects options like <em>--replace-all</em> -and <em>--unset</em>. <strong><tt>git-config</tt> will only ever change one file at a time</strong>.</p> -<p>You can override these rules either by command line options or by environment +and <em>--unset</em>. <strong><em>git-config</em> will only ever change one file at a time</strong>.</p></div> +<div class="para"><p>You can override these rules either by command line options or by environment variables. The <em>--global</em> and the <em>--system</em> options will limit the file used to the global or system-wide file respectively. The GIT_CONFIG environment -variable has a similar effect, but you can specify any filename you want.</p> -<p>The GIT_CONFIG_LOCAL environment variable on the other hand only changes +variable has a similar effect, but you can specify any filename you want.</p></div> +<div class="para"><p>The GIT_CONFIG_LOCAL environment variable on the other hand only changes the name used instead of the repository configuration file. The global and the system-wide configuration files will still be read. (For writing options -this will obviously result in the same behavior as using GIT_CONFIG.)</p> +this will obviously result in the same behavior as using GIT_CONFIG.)</p></div> </div> -<h2>ENVIRONMENT</h2> +<h2 id="_environment">ENVIRONMENT</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> GIT_CONFIG </dt> @@ -609,12 +657,12 @@ Still read the global and the system-wide configuration files, though. </p> </dd> -</dl> -<p>See also <a href="#FILES">[FILES]</a>.</p> +</dl></div> +<div class="para"><p>See also <a href="#FILES">[FILES]</a>.</p></div> </div> -<h2><a id="EXAMPLES"></a>EXAMPLES</h2> +<h2 id="EXAMPLES">EXAMPLES</h2> <div class="sectionbody"> -<p>Given a .git/config like this:</p> +<div class="para"><p>Given a .git/config like this:</p></div> <div class="literalblock"> <div class="content"> <pre><tt># @@ -644,70 +692,70 @@ gitproxy="proxy-command" for kernel.org gitproxy=default-proxy ; for all the rest</tt></pre> </div></div> -<p>you can set the filemode to true with</p> +<div class="para"><p>you can set the filemode to true with</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git config core.filemode true</tt></pre> </div></div> -<p>The hypothetical proxy command entries actually have a postfix to discern +<div class="para"><p>The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org -to "ssh".</p> +to "ssh".</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git config core.gitproxy '"ssh" for kernel.org' 'for kernel.org$'</tt></pre> </div></div> -<p>This makes sure that only the key/value pair for kernel.org is replaced.</p> -<p>To delete the entry for renames, do</p> +<div class="para"><p>This makes sure that only the key/value pair for kernel.org is replaced.</p></div> +<div class="para"><p>To delete the entry for renames, do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git config --unset diff.renames</tt></pre> </div></div> -<p>If you want to delete an entry for a multivar (like core.gitproxy above), -you have to provide a regex matching the value of exactly one line.</p> -<p>To query the value for a given key, do</p> +<div class="para"><p>If you want to delete an entry for a multivar (like core.gitproxy above), +you have to provide a regex matching the value of exactly one line.</p></div> +<div class="para"><p>To query the value for a given key, do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git config --get core.filemode</tt></pre> </div></div> -<p>or</p> +<div class="para"><p>or</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git config core.filemode</tt></pre> </div></div> -<p>or, to query a multivar:</p> +<div class="para"><p>or, to query a multivar:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git config --get core.gitproxy "for kernel.org$"</tt></pre> </div></div> -<p>If you want to know all the values for a multivar, do:</p> +<div class="para"><p>If you want to know all the values for a multivar, do:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git config --get-all core.gitproxy</tt></pre> </div></div> -<p>If you like to live dangerous, you can replace <strong>all</strong> core.gitproxy by a -new one with</p> +<div class="para"><p>If you like to live dangerous, you can replace <strong>all</strong> core.gitproxy by a +new one with</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git config --replace-all core.gitproxy ssh</tt></pre> </div></div> -<p>However, if you really only want to replace the line for the default proxy, -i.e. the one without a "for …" postfix, do something like this:</p> +<div class="para"><p>However, if you really only want to replace the line for the default proxy, +i.e. the one without a "for …" postfix, do something like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git config core.gitproxy ssh '! for '</tt></pre> </div></div> -<p>To actually match only values with an exclamation mark, you have to</p> +<div class="para"><p>To actually match only values with an exclamation mark, you have to</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git config section.key value '[!]'</tt></pre> </div></div> -<p>To add a new proxy, without altering any of the existing ones, use</p> +<div class="para"><p>To add a new proxy, without altering any of the existing ones, use</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git config core.gitproxy '"proxy-command" for example.com'</tt></pre> </div></div> -<p>An example to use customized color from the configuration in your -script:</p> +<div class="para"><p>An example to use customized color from the configuration in your +script:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>#!/bin/sh @@ -716,74 +764,74 @@ echo "${WS}your whitespace color or blue reverse${RESET}"</tt></pre> </div></div> </div> -<h2>CONFIGURATION FILE</h2> +<h2 id="_configuration_file">CONFIGURATION FILE</h2> <div class="sectionbody"> -<p>The git configuration file contains a number of variables that affect +<div class="para"><p>The git configuration file contains a number of variables that affect the git command's behavior. <tt>.git/config</tt> file for each repository is used to store the information for that repository, and <tt>$HOME/.gitconfig</tt> is used to store per user information to give fallback values for <tt>.git/config</tt> file. The file <tt>/etc/gitconfig</tt> -can be used to store system-wide defaults.</p> -<p>They can be used by both the git plumbing +can be used to store system-wide defaults.</p></div> +<div class="para"><p>They can be used by both the git plumbing and the porcelains. The variables are divided into sections, where in the fully qualified variable name the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive and only alphanumeric -characters are allowed. Some variables may appear multiple times.</p> -<h3>Syntax</h3> -<p>The syntax is fairly flexible and permissive; whitespaces are mostly +characters are allowed. Some variables may appear multiple times.</p></div> +<h3 id="_syntax">Syntax</h3><div style="clear:left"></div> +<div class="para"><p>The syntax is fairly flexible and permissive; whitespaces are mostly ignored. The <em>#</em> and <em>;</em> characters begin comments to the end of line, -blank lines are ignored.</p> -<p>The file consists of sections and variables. A section begins with +blank lines are ignored.</p></div> +<div class="para"><p>The file consists of sections and variables. A section begins with the name of the section in square brackets and continues until the next section begins. Section names are not case sensitive. Only alphanumeric characters, <em><tt>-</tt></em> and <em><tt>.</tt></em> are allowed in section names. Each variable must belong to some section, which means that there must be section -header before first setting of a variable.</p> -<p>Sections can be further divided into subsections. To begin a subsection +header before first setting of a variable.</p></div> +<div class="para"><p>Sections can be further divided into subsections. To begin a subsection put its name in double quotes, separated by space from the section name, -in the section header, like in example below:</p> +in the section header, like in example below:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [section "subsection"] </tt></pre> </div></div> -<p>Subsection names can contain any characters except newline (doublequote +<div class="para"><p>Subsection names can contain any characters except newline (doublequote <em><tt>"</tt></em> and backslash have to be escaped as <em><tt>\"</tt></em> and <em><tt>\\</tt></em>, respectively) and are case sensitive. Section header cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have <tt>[section]</tt> if you have <tt>[section "subsection"]</tt>, but you -don't need to.</p> -<p>There is also (case insensitive) alternative <tt>[section.subsection]</tt> syntax. +don't need to.</p></div> +<div class="para"><p>There is also (case insensitive) alternative <tt>[section.subsection]</tt> syntax. In this syntax subsection names follow the same restrictions as for section -name.</p> -<p>All the other lines are recognized as setting variables, in the form +name.</p></div> +<div class="para"><p>All the other lines are recognized as setting variables, in the form <em>name = value</em>. If there is no equal sign on the line, the entire line is taken as <em>name</em> and the variable is recognized as boolean "true". The variable names are case-insensitive and only alphanumeric characters and <em><tt>-</tt></em> are allowed. There can be more than one value -for a given variable; we say then that variable is multivalued.</p> -<p>Leading and trailing whitespace in a variable value is discarded. -Internal whitespace within a variable value is retained verbatim.</p> -<p>The values following the equals sign in variable assign are all either +for a given variable; we say then that variable is multivalued.</p></div> +<div class="para"><p>Leading and trailing whitespace in a variable value is discarded. +Internal whitespace within a variable value is retained verbatim.</p></div> +<div class="para"><p>The values following the equals sign in variable assign are all either a string, an integer, or a boolean. Boolean values may be given as yes/no, 0/1 or true/false. Case is not significant in boolean values, when converting value to the canonical form using <em>--bool</em> type specifier; -<tt>git-config</tt> will ensure that the output is "true" or "false".</p> -<p>String values may be entirely or partially enclosed in double quotes. +<em>git-config</em> will ensure that the output is "true" or "false".</p></div> +<div class="para"><p>String values may be entirely or partially enclosed in double quotes. You need to enclose variable value in double quotes if you want to preserve leading or trailing whitespace, or if variable value contains beginning of comment characters (if it contains <em>#</em> or <em>;</em>). Double quote <em><tt>"</tt></em> and backslash <em><tt>\</tt></em> characters in variable value must -be escaped: use <em><tt>\"</tt></em> for <em><tt>"</tt></em> and <em><tt>\\</tt></em> for <em><tt>\</tt></em>.</p> -<p>The following escape sequences (beside <em><tt>\"</tt></em> and <em><tt>\\</tt></em>) are recognized: +be escaped: use <em><tt>\"</tt></em> for <em><tt>"</tt></em> and <em><tt>\\</tt></em> for <em><tt>\</tt></em>.</p></div> +<div class="para"><p>The following escape sequences (beside <em><tt>\"</tt></em> and <em><tt>\\</tt></em>) are recognized: <em><tt>\n</tt></em> for newline character (NL), <em><tt>\t</tt></em> for horizontal tabulation (HT, TAB) and <em><tt>\b</tt></em> for backspace (BS). No other char escape sequence, nor octal -char sequences are valid.</p> -<p>Variable value ending in a <em><tt>\</tt></em> is continued on the next line in the -customary UNIX fashion.</p> -<p>Some variables may require special value format.</p> -<h3>Example</h3> +char sequences are valid.</p></div> +<div class="para"><p>Variable value ending in a <em><tt>\</tt></em> is continued on the next line in the +customary UNIX fashion.</p></div> +<div class="para"><p>Some variables may require special value format.</p></div> +<h3 id="_example">Example</h3><div style="clear:left"></div> <div class="literalblock"> <div class="content"> <pre><tt># Core variables @@ -811,12 +859,12 @@ gitProxy="ssh" for "kernel.org" gitProxy=default-proxy ; for the rest</tt></pre> </div></div> -<h3>Variables</h3> -<p>Note that this list is non-comprehensive and not necessarily complete. +<h3 id="_variables">Variables</h3><div style="clear:left"></div> +<div class="para"><p>Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page. You will find a description of non-core -porcelain configuration variables in the respective porcelain documentation.</p> -<dl> +porcelain configuration variables in the respective porcelain documentation.</p></div> +<div class="vlist"><dl> <dt> core.fileMode </dt> @@ -832,8 +880,8 @@ </dt> <dd> <p> - The commands that output paths (e.g. <tt>ls-files</tt>, - <tt>diff</tt>), when not given the <tt>-z</tt> option, will quote + The commands that output paths (e.g. <em>ls-files</em>, + <em>diff</em>), when not given the <tt>-z</tt> option, will quote "unusual" characters in the pathname by enclosing the pathname in a double-quote pair and with backslashes the same way strings in C source code are quoted. If this @@ -874,27 +922,27 @@ be set to "warn", in which case git will only warn about an irreversible conversion but continue the operation. </p> -<p>CRLF conversion bears a slight chance of corrupting data. +<div class="para"><p>CRLF conversion bears a slight chance of corrupting data. autocrlf=true will convert CRLF to LF during commit and LF to CRLF during checkout. A file that contains a mixture of LF and CRLF before the commit cannot be recreated by git. For text files this is the right thing to do: it corrects line endings such that we have only LF line endings in the repository. But for binary files that are accidentally classified as text the -conversion can corrupt data.</p> -<p>If you recognize such corruption early you can easily fix it by +conversion can corrupt data.</p></div> +<div class="para"><p>If you recognize such corruption early you can easily fix it by setting the conversion type explicitly in .gitattributes. Right after committing you still have the original file in your work tree and this file is not yet corrupted. You can explicitly tell git that this file is binary and git will handle the file -appropriately.</p> -<p>Unfortunately, the desired effect of cleaning up text files with +appropriately.</p></div> +<div class="para"><p>Unfortunately, the desired effect of cleaning up text files with mixed line endings and the undesired effect of corrupting binary files cannot be distinguished. In both cases CRLFs are removed in an irreversible way. For text files this is the right thing to do because CRLFs are line endings, while for binary files -converting CRLFs corrupts data.</p> -<p>Note, this safety check does not mean that a checkout will generate a +converting CRLFs corrupts data.</p></div> +<div class="para"><p>Note, this safety check does not mean that a checkout will generate a file identical to the original file for a different setting of <tt>core.autocrlf</tt>, but only for the current one. For example, a text file with <tt>LF</tt> would be accepted with <tt>core.autocrlf=input</tt> and could @@ -903,7 +951,7 @@ contained <tt>LF</tt>. However, in both work trees the line endings would be consistent, that is either all <tt>LF</tt> or all <tt>CRLF</tt>, but never mixed. A file with mixed line endings would be reported by the <tt>core.safecrlf</tt> -mechanism.</p> +mechanism.</p></div> </dd> <dt> core.symlinks @@ -930,9 +978,9 @@ may be set multiple times and is matched in the given order; the first match wins. </p> -<p>Can be overridden by the <em>GIT_PROXY_COMMAND</em> environment variable +<div class="para"><p>Can be overridden by the <em>GIT_PROXY_COMMAND</em> environment variable (which always applies universally, without the special "for" -handling).</p> +handling).</p></div> </dd> <dt> core.ignoreStat @@ -970,11 +1018,11 @@ number of commands that require a working directory will be disabled, such as <a href="git-add.html">git-add(1)</a> or <a href="git-merge.html">git-merge(1)</a>. </p> -<p>This setting is automatically guessed by <a href="git-clone.html">git-clone(1)</a> or +<div class="para"><p>This setting is automatically guessed by <a href="git-clone.html">git-clone(1)</a> or <a href="git-init.html">git-init(1)</a> when the repository was created. By default a repository that ends in "/.git" is assumed to be not bare (bare = false), while all other repositories are assumed to be bare (bare -= true).</p> += true).</p></div> </dd> <dt> core.worktree @@ -1006,11 +1054,11 @@ variable is set to true, missing "$GIT_DIR/logs/<ref>" file is automatically created for branch heads. </p> -<p>This information can be used to determine what commit -was the tip of a branch "2 days ago".</p> -<p>This value is true by default in a repository that has +<div class="para"><p>This information can be used to determine what commit +was the tip of a branch "2 days ago".</p></div> +<div class="para"><p>This value is true by default in a repository that has a working directory associated with it, and false by -default in a bare repository.</p> +default in a bare repository.</p></div> </dd> <dt> core.repositoryFormatVersion @@ -1085,11 +1133,11 @@ memory manager, but may improve performance when accessing a large number of large pack files. </p> -<p>Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32 +<div class="para"><p>Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32 MiB on 32 bit platforms and 1 GiB on 64 bit platforms. This should be reasonable for all users/operating systems. You probably do -not need to adjust this value.</p> -<p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p> +not need to adjust this value.</p></div> +<div class="para"><p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p></div> </dd> <dt> core.packedGitLimit @@ -1101,10 +1149,10 @@ bytes at once to complete an operation it will unmap existing regions to reclaim virtual address space within the process. </p> -<p>Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms. +<div class="para"><p>Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms. This should be reasonable for all users/operating systems, except on -the largest projects. You probably do not need to adjust this value.</p> -<p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p> +the largest projects. You probably do not need to adjust this value.</p></div> +<div class="para"><p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p></div> </dd> <dt> core.deltaBaseCacheLimit @@ -1117,10 +1165,10 @@ to avoid unpacking and decompressing frequently used base objects multiple times. </p> -<p>Default is 16 MiB on all platforms. This should be reasonable +<div class="para"><p>Default is 16 MiB on all platforms. This should be reasonable for all users/operating systems, except on the largest projects. -You probably do not need to adjust this value.</p> -<p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p> +You probably do not need to adjust this value.</p></div> +<div class="para"><p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p></div> </dd> <dt> core.excludesfile @@ -1161,11 +1209,11 @@ <dd> <p> A comma separated list of common whitespace problems to - notice. <tt>git diff</tt> will use <tt>color.diff.whitespace</tt> to - highlight them, and <tt>git apply --whitespace=error</tt> will + notice. <em>git-diff</em> will use <tt>color.diff.whitespace</tt> to + highlight them, and <em>git-apply --whitespace=error</em> will consider them as errors: </p> -<ul> +<div class="ilist"><ul> <li> <p> <tt>trailing-space</tt> treats trailing whitespaces at the end of the line @@ -1193,7 +1241,7 @@ is not a whitespace (not enabled by default). </p> </li> -</ul> +</ul></div> </dd> <dt> core.fsyncobjectfiles @@ -1202,10 +1250,10 @@ <p> This boolean will enable <em>fsync()</em> when writing object files. </p> -<p>This is a total waste of time and effort on a filesystem that orders +<div class="para"><p>This is a total waste of time and effort on a filesystem that orders data writes properly, but can be useful for filesystems that do not use journalling (traditional UNIX filesystems) or that only journal metadata -and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").</p> +and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").</p></div> </dd> <dt> alias.* @@ -1220,18 +1268,18 @@ spaces, the usual shell quoting and escaping is supported. quote pair and a backslash can be used to quote them. </p> -<p>If the alias expansion is prefixed with an exclamation point, +<div class="para"><p>If the alias expansion is prefixed with an exclamation point, it will be treated as a shell command. For example, defining "alias.new = !gitk --all --not ORIG_HEAD", the invocation "git new" is equivalent to running the shell command -"gitk --all --not ORIG_HEAD".</p> +"gitk --all --not ORIG_HEAD".</p></div> </dd> <dt> apply.whitespace </dt> <dd> <p> - Tells <tt>git-apply</tt> how to handle whitespaces, in the same way + Tells <em>git-apply</em> how to handle whitespaces, in the same way as the <em>--whitespace</em> option. See <a href="git-apply.html">git-apply(1)</a>. </p> </dd> @@ -1240,7 +1288,7 @@ </dt> <dd> <p> - Tells <tt>git-branch</tt> and <tt>git-checkout</tt> to setup new branches + Tells <em>git-branch</em> and <em>git-checkout</em> to setup new branches so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from the starting point branch. Note that even if this option is not set, this behavior can be chosen per-branch using the <tt>--track</tt> @@ -1256,7 +1304,7 @@ </dt> <dd> <p> - When a new branch is created with <tt>git-branch</tt> or <tt>git-checkout</tt> + When a new branch is created with <em>git-branch</em> or <em>git-checkout</em> that tracks another branch, this variable tells git to set up pull to rebase instead of merge (see "branch.<name>.rebase"). When <tt>never</tt>, rebase is never automatically set to true. @@ -1276,8 +1324,8 @@ </dt> <dd> <p> - When in branch <name>, it tells <tt>git fetch</tt> which remote to fetch. - If this option is not given, <tt>git fetch</tt> defaults to remote "origin". + When in branch <name>, it tells <em>git-fetch</em> which remote to fetch. + If this option is not given, <em>git-fetch</em> defaults to remote "origin". </p> </dd> <dt> @@ -1285,16 +1333,16 @@ </dt> <dd> <p> - When in branch <name>, it tells <tt>git fetch</tt> the default + When in branch <name>, it tells <em>git-fetch</em> the default refspec to be marked for merging in FETCH_HEAD. The value is handled like the remote part of a refspec, and must match a ref which is fetched from the remote given by "branch.<name>.remote". - The merge information is used by <tt>git pull</tt> (which at first calls - <tt>git fetch</tt>) to lookup the default branch for merging. Without - this option, <tt>git pull</tt> defaults to merge the first refspec fetched. + The merge information is used by <em>git-pull</em> (which at first calls + <em>git-fetch</em>) to lookup the default branch for merging. Without + this option, <em>git-pull</em> defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. - If you wish to setup <tt>git pull</tt> so that it merges into <name> from + If you wish to setup <em>git-pull</em> so that it merges into <name> from another branch in the local repository, you can point branch.<name>.merge to the desired branch, and use the special setting <tt>.</tt> (a period) for branch.<name>.remote. @@ -1374,13 +1422,13 @@ <tt>remote</tt> (a tracking branch in refs/remotes/), <tt>plain</tt> (other refs). </p> -<p>The value for these configuration variables is a list of colors (at most +<div class="para"><p>The value for these configuration variables is a list of colors (at most two) and attributes (at most one), separated by spaces. The colors accepted are <tt>normal</tt>, <tt>black</tt>, <tt>red</tt>, <tt>green</tt>, <tt>yellow</tt>, <tt>blue</tt>, <tt>magenta</tt>, <tt>cyan</tt> and <tt>white</tt>; the attributes are <tt>bold</tt>, <tt>dim</tt>, <tt>ul</tt>, <tt>blink</tt> and <tt>reverse</tt>. The first color given is the foreground; the second is the background. The position of the attribute, if any, -doesn't matter.</p> +doesn't matter.</p></div> </dd> <dt> color.diff @@ -1412,7 +1460,7 @@ <dd> <p> When set to <tt>always</tt>, always use colors for interactive prompts - and displays (such as those used by "git add --interactive"). + and displays (such as those used by "git-add --interactive"). When false (or <tt>never</tt>), never. When set to <tt>true</tt> or <tt>auto</tt>, use colors only when the output is to the terminal. Defaults to false. </p> @@ -1422,7 +1470,7 @@ </dt> <dd> <p> - Use customized color for <tt>git add --interactive</tt> + Use customized color for <em>git-add --interactive</em> output. <tt><slot></tt> may be <tt>prompt</tt>, <tt>header</tt>, or <tt>help</tt>, for three distinct types of normal output from interactive programs. The values of these variables may be specified as @@ -1489,14 +1537,14 @@ </dt> <dd> <p> - When using <tt>git diff</tt> to compare with work tree + When using <em>git-diff</em> to compare with work tree files, do not consider stat-only change as changed. Instead, silently run <tt>git update-index --refresh</tt> to update the cached stat information for paths whose contents in the work tree match the contents in the index. This option defaults to true. Note that this - affects only <tt>git diff</tt> Porcelain, and not lower level - <tt>diff</tt> commands, such as <tt>git diff-files</tt>. + affects only <em>git-diff</em> Porcelain, and not lower level + <em>diff</em> commands, such as <em>git-diff-files</em>. </p> </dd> <dt> @@ -1517,7 +1565,7 @@ <dd> <p> The number of files to consider when performing the copy/rename - detection; equivalent to the git diff option <em>-l</em>. + detection; equivalent to the <em>git-diff</em> option <em>-l</em>. </p> </dd> <dt> @@ -1592,7 +1640,7 @@ <dd> <p> The window size parameter used in the delta compression - algorithm used by <em>git gc --aggressive</em>. This defaults + algorithm used by <em>git-gc --aggressive</em>. This defaults to 10. </p> </dd> @@ -1624,15 +1672,15 @@ </dt> <dd> <p> - <tt>git gc</tt> does not run <tt>git pack-refs</tt> in a bare repository by + <em>git-gc</em> does not run <tt>git pack-refs</tt> in a bare repository by default so that older dumb-transport clients can still fetch - from the repository. Setting this to <tt>true</tt> lets <tt>git - gc</tt> to run <tt>git pack-refs</tt>. Setting this to <tt>false</tt> tells - <tt>git gc</tt> never to run <tt>git pack-refs</tt>. The default setting is + from the repository. Setting this to <tt>true</tt> lets <em>git-gc</em> + to run <tt>git pack-refs</tt>. Setting this to <tt>false</tt> tells + <em>git-gc</em> never to run <tt>git pack-refs</tt>. The default setting is <tt>notbare</tt>. Enable it only when you know you do not have to support such clients. The default setting will change to <tt>true</tt> at some stage, and setting this to <tt>false</tt> will continue to - prevent <tt>git pack-refs</tt> from being run from <tt>git gc</tt>. + prevent <tt>git pack-refs</tt> from being run from <em>git-gc</em>. </p> </dd> <dt> @@ -1640,7 +1688,7 @@ </dt> <dd> <p> - When <tt>git gc</tt> is run, it will call <tt>prune --expire 2.weeks.ago</tt>. + When <em>git-gc</em> is run, it will call <em>prune --expire 2.weeks.ago</em>. Override the grace period with this config variable. </p> </dd> @@ -1649,7 +1697,7 @@ </dt> <dd> <p> - <tt>git reflog expire</tt> removes reflog entries older than + <em>git-reflog expire</em> removes reflog entries older than this time; defaults to 90 days. </p> </dd> @@ -1658,7 +1706,7 @@ </dt> <dd> <p> - <tt>git reflog expire</tt> removes reflog entries older than + <em>git-reflog expire</em> removes reflog entries older than this time and are not reachable from the current tip; defaults to 30 days. </p> @@ -1669,7 +1717,7 @@ <dd> <p> Records of conflicted merge you resolved earlier are - kept for this many days when <tt>git rerere gc</tt> is run. + kept for this many days when <em>git-rerere gc</em> is run. The default is 60 days. See <a href="git-rerere.html">git-rerere(1)</a>. </p> </dd> @@ -1679,7 +1727,7 @@ <dd> <p> Records of conflicted merge you have not resolved are - kept for this many days when <tt>git rerere gc</tt> is run. + kept for this many days when <em>git-rerere gc</em> is run. The default is 15 days. See <a href="git-rerere.html">git-rerere(1)</a>. </p> </dd> @@ -1713,16 +1761,16 @@ various stuff. See <a href="git-cvsserver.html">git-cvsserver(1)</a>. </p> </dd> -</dl> -<p>gitcvs.usecrlfattr +</dl></div> +<div class="para"><p>gitcvs.usecrlfattr If true, the server will look up the <tt>crlf</tt> attribute for files to determine the <em>-k</em> modes to use. If <tt>crlf</tt> is set, the <em>-k</em> mode will be left blank, so cvs clients will treat it as text. If <tt>crlf</tt> is explicitly unset, the file will be set with <em>-kb</em> mode, which supresses any newline munging the client might otherwise do. If <tt>crlf</tt> is not specified, - then <em>gitcvs.allbinary</em> is used. See <a href="gitattribute.html">gitattribute(5)</a>.</p> -<dl> + then <em>gitcvs.allbinary</em> is used. See <a href="gitattribute.html">gitattribute(5)</a>.</p></div> +<div class="vlist"><dl> <dt> gitcvs.allbinary </dt> @@ -1787,13 +1835,13 @@ characters will be replaced with underscores. </p> </dd> -</dl> -<p>All gitcvs variables except for <em>gitcvs.usecrlfattr</em> and +</dl></div> +<div class="para"><p>All gitcvs variables except for <em>gitcvs.usecrlfattr</em> and <em>gitcvs.allbinary</em> can also be specified as <em>gitcvs.<access_method>.<varname></em> (where <em>access_method</em> is one of "ext" and "pserver") to make them apply only for the given -access method.</p> -<dl> +access method.</p></div> +<div class="vlist"><dl> <dt> gui.commitmsgwidth </dt> @@ -1987,7 +2035,7 @@ <dd> <p> Character encoding the commit messages are converted to when - running <tt>git-log</tt> and friends. + running <em>git-log</em> and friends. </p> </dd> <dt> @@ -2040,7 +2088,7 @@ <dd> <p> Set default date-time mode for the log command. Setting log.date - value is similar to using git log's --date option. The value is one of + value is similar to using <em>git-log</em>'s --date option. The value is one of the following alternatives: {relative,local,default,iso,rfc,short}. See <a href="git-log.html">git-log(1)</a>. </p> @@ -2304,13 +2352,13 @@ and this config option ignored whenever the corresponding pack is larger than 2 GB. </p> -<p>If you have an old git that does not understand the version 2 <tt>*.idx</tt> file, +<div class="para"><p>If you have an old git that does not understand the version 2 <tt>*.idx</tt> file, cloning or fetching over a non native protocol (e.g. "http" and "rsync") that will copy both <tt>*.pack</tt> file and corresponding <tt>*.idx</tt> file from the other side may give you a repository that cannot be accessed with your older version of git. If the <tt>*.pack</tt> file is smaller than 2 GB, however, you can use <a href="git-index-pack.html">git-index-pack(1)</a> on the *.pack file to regenerate -the <tt>*.idx</tt> file.</p> +the <tt>*.idx</tt> file.</p></div> </dd> <dt> pack.packSizeLimit @@ -2477,7 +2525,7 @@ systems. So, this variable controls how the commands displays the untracked files. Possible values are: </p> -<ul> +<div class="ilist"><ul> <li> <p> <em>no</em> - Show no untracked files @@ -2493,10 +2541,10 @@ <em>all</em> - Shows also individual files in untracked directories. </p> </li> -</ul> -<p>If this variable is not specified, it defaults to <em>normal</em>. +</ul></div> +<div class="para"><p>If this variable is not specified, it defaults to <em>normal</em>. This variable can be overridden with the -u|--untracked-files option -of <a href="git-status.html">git-status(1)</a> and <a href="git-commit.html">git-commit(1)</a>.</p> +of <a href="git-status.html">git-status(1)</a> and <a href="git-commit.html">git-commit(1)</a>.</p></div> </dd> <dt> tar.umask @@ -2624,23 +2672,23 @@ may use it. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Johannes Schindelin <Johannes.Schindelin@gmx.de></p> +<div class="para"><p>Written by Johannes Schindelin <Johannes.Schindelin@gmx.de></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Johannes Schindelin, Petr Baudis and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Johannes Schindelin, Petr Baudis and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:37 UTC +Last updated 2008-07-06 05:16:39 UTC </div> </div> </body> diff --git a/git-config.txt b/git-config.txt index 63ddb2c..df419e2 100644 --- a/git-config.txt +++ b/git-config.txt
@@ -37,7 +37,7 @@ prepend a single exclamation mark in front (see also <<EXAMPLES>>). The type specifier can be either '--int' or '--bool', which will make -`git-config` ensure that the variable(s) are of the given type and +'git-config' ensure that the variable(s) are of the given type and convert the value to the canonical form (simple decimal number for int, a "true" or "false" string for bool). If no type specifier is passed, no checks or transformations are performed on the value. @@ -122,10 +122,10 @@ List all variables set in config file. --bool:: - `git-config` will ensure that the output is "true" or "false" + 'git-config' will ensure that the output is "true" or "false" --int:: - `git-config` will ensure that the output is a simple + 'git-config' will ensure that the output is a simple decimal number. An optional value suffix of 'k', 'm', or 'g' in the config file will cause the value to be multiplied by 1024, 1048576, or 1073741824 prior to output. @@ -162,7 +162,7 @@ ----- If not set explicitly with '--file', there are three files where -`git-config` will search for configuration options: +'git-config' will search for configuration options: $GIT_DIR/config:: Repository specific configuration file. (The filename is @@ -179,12 +179,12 @@ If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration -file is not available or readable, `git-config` will exit with a non-zero +file is not available or readable, 'git-config' will exit with a non-zero error code. However, in neither case will an error message be issued. All writing options will per default write to the repository specific configuration file. Note that this also affects options like '--replace-all' -and '--unset'. *`git-config` will only ever change one file at a time*. +and '--unset'. *'git-config' will only ever change one file at a time*. You can override these rules either by command line options or by environment variables. The '--global' and the '--system' options will limit the file used
diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index 054ce62..17648b8 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-cvsexportcommit(1)</title> </head> @@ -272,26 +320,26 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git cvsexportcommit</em> [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] - [-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p> +<div class="para"><p><em>git cvsexportcommit</em> [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] + [-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Exports a commit from GIT to a CVS checkout, making it easier -to merge patches from a git repository into a CVS repository.</p> -<p>Specify the name of a CVS checkout using the -w switch or execute it +<div class="para"><p>Exports a commit from GIT to a CVS checkout, making it easier +to merge patches from a git repository into a CVS repository.</p></div> +<div class="para"><p>Specify the name of a CVS checkout using the -w switch or execute it from the root of the CVS working copy. In the latter case GIT_DIR must -be defined. See examples below.</p> -<p>It does its best to do the safe thing, it will check that the files are +be defined. See examples below.</p></div> +<div class="para"><p>It does its best to do the safe thing, it will check that the files are unchanged and up to date in the CVS checkout, and it will not autocommit -by default.</p> -<p>Supports file additions, removals, and commits that affect binary files.</p> -<p>If the commit is a merge commit, you must tell <tt>git-cvsexportcommit</tt> what -parent the changeset should be done against.</p> +by default.</p></div> +<div class="para"><p>Supports file additions, removals, and commits that affect binary files.</p></div> +<div class="para"><p>If the commit is a merge commit, you must tell <em>git-cvsexportcommit</em> what +parent the changeset should be done against.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -c </dt> @@ -391,11 +439,11 @@ Verbose. </p> </dd> -</dl> +</dl></div> </div> -<h2>CONFIGURATION</h2> +<h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> cvsexportcommit.cvsdir </dt> @@ -404,11 +452,11 @@ The default location of the CVS checkout to use for the export. </p> </dd> -</dl> +</dl></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> Merge one patch into CVS </dt> @@ -441,23 +489,23 @@ $ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit -c -p -v</tt></pre> </div></div> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Martin Langhoff <martin@catalyst.net.nz> and others.</p> +<div class="para"><p>Written by Martin Langhoff <martin@catalyst.net.nz> and others.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Martin Langhoff <martin@catalyst.net.nz> and others.</p> +<div class="para"><p>Documentation by Martin Langhoff <martin@catalyst.net.nz> and others.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:38 UTC +Last updated 2008-07-06 05:16:40 UTC </div> </div> </body> diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index 2a02ffa..2da8588 100644 --- a/git-cvsexportcommit.txt +++ b/git-cvsexportcommit.txt
@@ -27,7 +27,7 @@ Supports file additions, removals, and commits that affect binary files. -If the commit is a merge commit, you must tell `git-cvsexportcommit` what +If the commit is a merge commit, you must tell 'git-cvsexportcommit' what parent the changeset should be done against. OPTIONS
diff --git a/git-cvsimport.html b/git-cvsimport.html index 2de1108..8ba3372 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-cvsimport(1)</title> </head> @@ -279,22 +327,27 @@ [-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>] [-r <remote>] [<CVS_module>]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Imports a CVS repository into git. It will either create a new -repository, or incrementally import into an existing one.</p> -<p>Splitting the CVS log into patch sets is done by <em>cvsps</em>. -At least version 2.1 is required.</p> -<p>You should <strong>never</strong> do any work of your own on the branches that are -created by <tt>git-cvsimport</tt>. By default initial import will create and populate a +<div class="para"><p>Imports a CVS repository into git. It will either create a new +repository, or incrementally import into an existing one.</p></div> +<div class="para"><p>Splitting the CVS log into patch sets is done by <em>cvsps</em>. +At least version 2.1 is required.</p></div> +<div class="para"><p>You should <strong>never</strong> do any work of your own on the branches that are +created by <em>git-cvsimport</em>. By default initial import will create and populate a "master" branch from the CVS repository's main branch which you're free -to work with; after that, you need to <tt>git-merge</tt> incremental imports, or +to work with; after that, you need to <em>git-merge</em> incremental imports, or any CVS branches, yourself. It is advisable to specify a named remote via --r to separate and protect the incoming branches.</p> +-r to separate and protect the incoming branches.</p></div> +<div class="para"><p>If you intend to set up a shared public repository that all developers can +read/write, or if you want to use <a href="git-cvsserver.html">git-cvsserver(1)</a>, then you +probably want to make a bare clone of the imported repository, +and use the clone as the shared repository. +See <a href="gitcvs-migration.html">gitcvs-migration(7)</a>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -v </dt> @@ -310,7 +363,7 @@ <p> The root of the CVS archive. May be local (a simple path) or remote; currently, only the :local:, :ext: and :pserver: access methods - are supported. If not given, <tt>git-cvsimport</tt> will try to read it + are supported. If not given, <em>git-cvsimport</em> will try to read it from <tt>CVS/Root</tt>. If no such file exists, it checks for the <tt>CVSROOT</tt> environment variable. </p> @@ -321,7 +374,7 @@ <dd> <p> The CVS module you want to import. Relative to <CVSROOT>. - If not given, <tt>git-cvsimport</tt> tries to read it from + If not given, <em>git-cvsimport</em> tries to read it from <tt>CVS/Repository</tt>. </p> </dd> @@ -341,7 +394,7 @@ <p> The git remote to import this CVS repository into. Moves all CVS branches into remotes/<remote>/<branch> - akin to the <tt>git-clone</tt> "--use-separate-remote" option. + akin to the <em>git-clone</em> "--use-separate-remote" option. </p> </dd> <dt> @@ -353,12 +406,12 @@ from CVS is imported to the <em>origin</em> branch within the git repository, as <em>HEAD</em> already has a special meaning for git. When a remote is specified the <em>HEAD</em> branch is named - remotes/<remote>/master mirroring <tt>git-clone</tt> behaviour. + remotes/<remote>/master mirroring <em>git-clone</em> behaviour. Use this option if you want to import into a different branch. </p> -<p>Use <em>-o master</em> for continuing an import that was initially done by -the old cvs2git tool.</p> +<div class="para"><p>Use <em>-o master</em> for continuing an import that was initially done by +the old cvs2git tool.</p></div> </dd> <dt> -i @@ -404,7 +457,7 @@ Additional options for cvsps. The options <em>-u</em> and <em>-A</em> are implicit and should not be used here. </p> -<p>If you need to pass multiple options, separate them with a comma.</p> +<div class="para"><p>If you need to pass multiple options, separate them with a comma.</p></div> </dd> <dt> -z <fuzz> @@ -443,8 +496,8 @@ regex. It can be used with <em>-m</em> to enable the default regexes as well. You must escape forward slashes. </p> -<p>The regex must capture the source branch name in $1.</p> -<p>This option can be used several times to provide several detection regexes.</p> +<div class="para"><p>The regex must capture the source branch name in $1.</p></div> +<div class="para"><p>This option can be used several times to provide several detection regexes.</p></div> </dd> <dt> -S <regex> @@ -487,15 +540,15 @@ spawn=Simon Pawn <spawn@frog-pond.org> </tt></pre> </div></div> -<p><tt>git-cvsimport</tt> will make it appear as those authors had +<div class="para"><p><em>git-cvsimport</em> will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly -all along.</p> -<p>For convenience, this data is saved to <tt>$GIT_DIR/cvs-authors</tt> +all along.</p></div> +<div class="para"><p>For convenience, this data is saved to <tt>$GIT_DIR/cvs-authors</tt> each time the <em>-A</em> option is provided and read from that same -file each time <tt>git-cvsimport</tt> is run.</p> -<p>It is not recommended to use this feature if you intend to +file each time <em>git-cvsimport</em> is run.</p></div> +<div class="para"><p>It is not recommended to use this feature if you intend to export changes back to CVS again later with -<tt>git-cvsexportcommit</tt>.</p> +<em>git-cvsexportcommit</em>.</p></div> </dd> <dt> -h @@ -505,30 +558,30 @@ Print a short usage message and exit. </p> </dd> -</dl> +</dl></div> </div> -<h2>OUTPUT</h2> +<h2 id="_output">OUTPUT</h2> <div class="sectionbody"> -<p>If <em>-v</em> is specified, the script reports what it is doing.</p> -<p>Otherwise, success is indicated the Unix way, i.e. by simply exiting with -a zero exit status.</p> +<div class="para"><p>If <em>-v</em> is specified, the script reports what it is doing.</p></div> +<div class="para"><p>Otherwise, success is indicated the Unix way, i.e. by simply exiting with +a zero exit status.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Matthias Urlichs <smurf@smurf.noris.de>, with help from -various participants of the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Written by Matthias Urlichs <smurf@smurf.noris.de>, with help from +various participants of the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Matthias Urlichs <smurf@smurf.noris.de>.</p> +<div class="para"><p>Documentation by Matthias Urlichs <smurf@smurf.noris.de>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:38 UTC +Last updated 2008-07-06 05:16:40 UTC </div> </div> </body> diff --git a/git-cvsimport.txt b/git-cvsimport.txt index ed79bb8..b7a8c10 100644 --- a/git-cvsimport.txt +++ b/git-cvsimport.txt
@@ -25,12 +25,18 @@ At least version 2.1 is required. You should *never* do any work of your own on the branches that are -created by `git-cvsimport`. By default initial import will create and populate a +created by 'git-cvsimport'. By default initial import will create and populate a "master" branch from the CVS repository's main branch which you're free -to work with; after that, you need to `git-merge` incremental imports, or +to work with; after that, you need to 'git-merge' incremental imports, or any CVS branches, yourself. It is advisable to specify a named remote via -r to separate and protect the incoming branches. +If you intend to set up a shared public repository that all developers can +read/write, or if you want to use linkgit:git-cvsserver[1], then you +probably want to make a bare clone of the imported repository, +and use the clone as the shared repository. +See linkgit:gitcvs-migration[7]. + OPTIONS ------- @@ -40,13 +46,13 @@ -d <CVSROOT>:: The root of the CVS archive. May be local (a simple path) or remote; currently, only the :local:, :ext: and :pserver: access methods - are supported. If not given, `git-cvsimport` will try to read it + are supported. If not given, 'git-cvsimport' will try to read it from `CVS/Root`. If no such file exists, it checks for the `CVSROOT` environment variable. <CVS_module>:: The CVS module you want to import. Relative to <CVSROOT>. - If not given, `git-cvsimport` tries to read it from + If not given, 'git-cvsimport' tries to read it from `CVS/Repository`. -C <target-dir>:: @@ -56,14 +62,14 @@ -r <remote>:: The git remote to import this CVS repository into. Moves all CVS branches into remotes/<remote>/<branch> - akin to the `git-clone` "--use-separate-remote" option. + akin to the 'git-clone' "--use-separate-remote" option. -o <branch-for-HEAD>:: When no remote is specified (via -r) the 'HEAD' branch from CVS is imported to the 'origin' branch within the git repository, as 'HEAD' already has a special meaning for git. When a remote is specified the 'HEAD' branch is named - remotes/<remote>/master mirroring `git-clone` behaviour. + remotes/<remote>/master mirroring 'git-clone' behaviour. Use this option if you want to import into a different branch. + @@ -136,17 +142,17 @@ --------- + -`git-cvsimport` will make it appear as those authors had +'git-cvsimport' will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. + For convenience, this data is saved to `$GIT_DIR/cvs-authors` each time the '-A' option is provided and read from that same -file each time `git-cvsimport` is run. +file each time 'git-cvsimport' is run. + It is not recommended to use this feature if you intend to export changes back to CVS again later with -`git-cvsexportcommit`. +'git-cvsexportcommit'. -h:: Print a short usage message and exit.
diff --git a/git-cvsserver.html b/git-cvsserver.html index 51269ed..1593556 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-cvsserver(1)</title> </head> @@ -272,23 +320,23 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p>SSH:</p> +<div class="para"><p>SSH:</p></div> <div class="verseblock"> <div class="content">export CVS_SERVER=git-cvsserver <em>cvs</em> -d :ext:user@server/path/repo.git co <HEAD_name></div></div> -<p>pserver (/etc/inetd.conf):</p> +<div class="para"><p>pserver (/etc/inetd.conf):</p></div> <div class="verseblock"> <div class="content">cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver</div></div> -<p>Usage:</p> +<div class="para"><p>Usage:</p></div> <div class="verseblock"> <div class="content"><em>git cvsserver</em> [options] [pserver|server] [<directory> …]</div></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<p>All these options obviously only make sense if enforced by the server side. +<div class="para"><p>All these options obviously only make sense if enforced by the server side. They have been implemented to resemble the <a href="git-daemon.html">git-daemon(1)</a> options as -closely as possible.</p> -<dl> +closely as possible.</p></div> +<div class="vlist"><dl> <dt> --base-path <path> </dt> @@ -350,29 +398,29 @@ unless <em>--export-all</em> was given, too. </p> </dd> -</dl> +</dl></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This application is a CVS emulation layer for git.</p> -<p>It is highly functional. However, not all methods are implemented, +<div class="para"><p>This application is a CVS emulation layer for git.</p></div> +<div class="para"><p>It is highly functional. However, not all methods are implemented, and for those methods that are implemented, -not all switches are implemented.</p> -<p>Testing has been done using both the CLI CVS client, and the Eclipse CVS -plugin. Most functionality works fine with both of these clients.</p> +not all switches are implemented.</p></div> +<div class="para"><p>Testing has been done using both the CLI CVS client, and the Eclipse CVS +plugin. Most functionality works fine with both of these clients.</p></div> </div> -<h2>LIMITATIONS</h2> +<h2 id="_limitations">LIMITATIONS</h2> <div class="sectionbody"> -<p>Currently cvsserver works over SSH connections for read/write clients, and -over pserver for anonymous CVS access.</p> -<p>CVS clients cannot tag, branch or perform GIT merges.</p> -<p><tt>git-cvsserver</tt> maps GIT branches to CVS modules. This is very different +<div class="para"><p>Currently cvsserver works over SSH connections for read/write clients, and +over pserver for anonymous CVS access.</p></div> +<div class="para"><p>CVS clients cannot tag, branch or perform GIT merges.</p></div> +<div class="para"><p><em>git-cvsserver</em> maps GIT branches to CVS modules. This is very different from what most CVS users would expect since in CVS modules usually represent -one or more directories.</p> +one or more directories.</p></div> </div> -<h2>INSTALLATION</h2> +<h2 id="_installation">INSTALLATION</h2> <div class="sectionbody"> -<ol> +<div class="olist"><ol> <li> <p> If you are going to offer anonymous CVS access via pserver, add a line in @@ -383,29 +431,29 @@ <pre><tt> cvspserver stream tcp nowait nobody git-cvsserver pserver </tt></pre> </div></div> -<p>Note: Some inetd servers let you specify the name of the executable +<div class="para"><p>Note: Some inetd servers let you specify the name of the executable independently of the value of argv[0] (i.e. the name the program assumes it was executed with). In this case the correct line in /etc/inetd.conf -looks like</p> +looks like</p></div> <div class="listingblock"> <div class="content"> <pre><tt> cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver </tt></pre> </div></div> -<p>No special setup is needed for SSH access, other than having GIT tools +<div class="para"><p>No special setup is needed for SSH access, other than having GIT tools in the PATH. If you have clients that do not accept the CVS_SERVER -environment variable, you can rename <tt>git-cvsserver</tt> to <tt>cvs</tt>.</p> -<p>Note: Newer CVS versions (>= 1.12.11) also support specifying -CVS_SERVER directly in CVSROOT like</p> +environment variable, you can rename <em>git-cvsserver</em> to <tt>cvs</tt>.</p></div> +<div class="para"><p>Note: Newer CVS versions (>= 1.12.11) also support specifying +CVS_SERVER directly in CVSROOT like</p></div> <div class="listingblock"> <div class="content"> <pre><tt>cvs -d ":ext;CVS_SERVER=git-cvsserver:user@server/path/repo.git" co <HEAD_name></tt></pre> </div></div> -<p>This has the advantage that it will be saved in your <em>CVS/Root</em> files and +<div class="para"><p>This has the advantage that it will be saved in your <em>CVS/Root</em> files and you don't need to worry about always setting the correct environment -variable. SSH users restricted to <tt>git-shell</tt> don't need to override the default -with CVS_SERVER (and shouldn't) as <tt>git-shell</tt> understands <tt>cvs</tt> to mean -<tt>git-cvsserver</tt> and pretends that the other end runs the real <tt>cvs</tt> better.</p> +variable. SSH users restricted to <em>git-shell</em> don't need to override the default +with CVS_SERVER (and shouldn't) as <em>git-shell</em> understands <tt>cvs</tt> to mean +<em>git-cvsserver</em> and pretends that the other end runs the real <em>cvs</em> better.</p></div> </li> <li> <p> @@ -420,14 +468,16 @@ logfile=/path/to/logfile </tt></pre> </div></div> -<p>Note: you need to ensure each user that is going to invoke <tt>git-cvsserver</tt> has +<div class="para"><p>Note: you need to ensure each user that is going to invoke <em>git-cvsserver</em> has write access to the log file and to the database (see <a href="#dbbackend">Database Backend</a>. If you want to offer write access over -SSH, the users of course also need write access to the git repository itself.</p> -<p><a id="configaccessmethod"></a>All configuration variables can also be overridden for a specific method of +SSH, the users of course also need write access to the git repository itself.</p></div> +<div class="para"><p>You also need to ensure that each repository is "bare" (without a git index +file) for <tt>cvs commit</tt> to work. See <a href="gitcvs-migration.html">gitcvs-migration(7)</a>.</p></div> +<div class="para" id="configaccessmethod"><p>All configuration variables can also be overridden for a specific method of access. Valid method names are "ext" (for SSH access) and "pserver". The following example configuration would disable pserver access while still -allowing access over SSH.</p> +allowing access over SSH.</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [gitcvs] @@ -443,7 +493,7 @@ automatically saving it in your <em>CVS/Root</em> files, then you need to set them explicitly in your environment. CVSROOT should be set as per normal, but the directory should point at the appropriate git repo. As above, for SSH clients - _not_ restricted to <tt>git-shell</tt>, CVS_SERVER should be set to <tt>git-cvsserver</tt>. + <em>not</em> restricted to <em>git-shell</em>, CVS_SERVER should be set to <em>git-cvsserver</em>. </p> <div class="listingblock"> <div class="content"> @@ -473,36 +523,36 @@ <pre><tt> cvs co -d project-master master</tt></pre> </div></div> </li> -</ol> +</ol></div> </div> -<h2><a id="dbbackend"></a>Database Backend</h2> +<h2 id="dbbackend">Database Backend</h2> <div class="sectionbody"> -<p><tt>git-cvsserver</tt> uses one database per git head (i.e. CVS module) to +<div class="para"><p><em>git-cvsserver</em> uses one database per git head (i.e. CVS module) to store information about the repository for faster access. The database doesn't contain any persistent data and can be completely regenerated from the git repository at any time. The database -needs to be updated (i.e. written to) after every commit.</p> -<p>If the commit is done directly by using <tt>git</tt> (as opposed to -using <tt>git-cvsserver</tt>) the update will need to happen on the -next repository access by <tt>git-cvsserver</tt>, independent of -access method and requested operation.</p> -<p>That means that even if you offer only read access (e.g. by using -the pserver method), <tt>git-cvsserver</tt> should have write access to +needs to be updated (i.e. written to) after every commit.</p></div> +<div class="para"><p>If the commit is done directly by using <tt>git</tt> (as opposed to +using <em>git-cvsserver</em>) the update will need to happen on the +next repository access by <em>git-cvsserver</em>, independent of +access method and requested operation.</p></div> +<div class="para"><p>That means that even if you offer only read access (e.g. by using +the pserver method), <em>git-cvsserver</em> should have write access to the database to work reliably (otherwise you need to make sure -that the database is up-to-date any time <tt>git-cvsserver</tt> is executed).</p> -<p>By default it uses SQLite databases in the git directory, named +that the database is up-to-date any time <em>git-cvsserver</em> is executed).</p></div> +<div class="para"><p>By default it uses SQLite databases in the git directory, named <tt>gitcvs.<module_name>.sqlite</tt>. Note that the SQLite backend creates temporary files in the same directory as the database file on write so it might not be enough to grant the users using -<tt>git-cvsserver</tt> write access to the database file without granting -them write access to the directory, too.</p> -<p>You can configure the database backend with the following -configuration variables:</p> -<h3>Configuring database backend</h3> -<p><tt>git-cvsserver</tt> uses the Perl DBI module. Please also read +<em>git-cvsserver</em> write access to the database file without granting +them write access to the directory, too.</p></div> +<div class="para"><p>You can configure the database backend with the following +configuration variables:</p></div> +<h3 id="_configuring_database_backend">Configuring database backend</h3><div style="clear:left"></div> +<div class="para"><p><em>git-cvsserver</em> uses the Perl DBI module. Please also read its documentation if changing these variables, especially -about <tt>DBI->connect()</tt>.</p> -<dl> +about <tt>DBI->connect()</tt>.</p></div> +<div class="vlist"><dl> <dt> gitcvs.dbname </dt> @@ -558,11 +608,11 @@ with underscores. </p> </dd> -</dl> -<p>All variables can also be set per access method, see <a href="#configaccessmethod">above</a>.</p> -<h4>Variable substitution</h4> -<p>In <tt>dbdriver</tt> and <tt>dbuser</tt> you can use the following variables:</p> -<dl> +</dl></div> +<div class="para"><p>All variables can also be set per access method, see <a href="#configaccessmethod">above</a>.</p></div> +<h4 id="_variable_substitution">Variable substitution</h4> +<div class="para"><p>In <tt>dbdriver</tt> and <tt>dbuser</tt> you can use the following variables:</p></div> +<div class="vlist"><dl> <dt> %G </dt> @@ -603,17 +653,17 @@ </dt> <dd> <p> - Name of the user running <tt>git-cvsserver</tt>. + Name of the user running <em>git-cvsserver</em>. If no name can be determined, the numeric uid is used. </p> </dd> -</dl> +</dl></div> </div> -<h2>Eclipse CVS Client Notes</h2> +<h2 id="_eclipse_cvs_client_notes">Eclipse CVS Client Notes</h2> <div class="sectionbody"> -<p>To get a checkout with the Eclipse CVS client:</p> -<ol> +<div class="para"><p>To get a checkout with the Eclipse CVS client:</p></div> +<div class="olist"><ol> <li> <p> Select "Create a new project -> From CVS checkout" @@ -638,20 +688,20 @@ "launch commit wizard" to avoid committing the .project file. </p> </li> -</ol> -<p>Protocol notes: If you are using anonymous access via pserver, just select that. +</ol></div> +<div class="para"><p>Protocol notes: If you are using anonymous access via pserver, just select that. Those using SSH access should choose the <em>ext</em> protocol, and configure <em>ext</em> access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to -<tt>git-cvsserver</tt>. Note that password support is not good when using <em>ext</em>, -you will definitely want to have SSH keys setup.</p> -<p>Alternatively, you can just use the non-standard extssh protocol that Eclipse +<em>git-cvsserver</em>. Note that password support is not good when using <em>ext</em>, +you will definitely want to have SSH keys setup.</p></div> +<div class="para"><p>Alternatively, you can just use the non-standard extssh protocol that Eclipse offer. In that case CVS_SERVER is ignored, and you will have to replace -the cvs utility on the server with <tt>git-cvsserver</tt> or manipulate your <tt>.bashrc</tt> -so that calling <em>cvs</em> effectively calls <tt>git-cvsserver</tt>.</p> +the cvs utility on the server with <em>git-cvsserver</em> or manipulate your <tt>.bashrc</tt> +so that calling <em>cvs</em> effectively calls <em>git-cvsserver</em>.</p></div> </div> -<h2>Clients known to work</h2> +<h2 id="_clients_known_to_work">Clients known to work</h2> <div class="sectionbody"> -<ul> +<div class="ilist"><ul> <li> <p> CVS 1.12.9 on Debian @@ -672,46 +722,46 @@ TortoiseCVS </p> </li> -</ul> +</ul></div> </div> -<h2>Operations supported</h2> +<h2 id="_operations_supported">Operations supported</h2> <div class="sectionbody"> -<p>All the operations required for normal use are supported, including +<div class="para"><p>All the operations required for normal use are supported, including checkout, diff, status, update, log, add, remove, commit. Legacy monitoring operations are not supported (edit, watch and related). -Exports and tagging (tags and branches) are not supported at this stage.</p> -<h3>CRLF Line Ending Conversions</h3> -<p>By default the server leaves the <em>-k</em> mode blank for all files, +Exports and tagging (tags and branches) are not supported at this stage.</p></div> +<h3 id="_crlf_line_ending_conversions">CRLF Line Ending Conversions</h3><div style="clear:left"></div> +<div class="para"><p>By default the server leaves the <em>-k</em> mode blank for all files, which causes the cvs client to treat them as a text files, subject -to crlf conversion on some platforms.</p> -<p>You can make the server use <tt>crlf</tt> attributes to set the <em>-k</em> modes +to crlf conversion on some platforms.</p></div> +<div class="para"><p>You can make the server use <tt>crlf</tt> attributes to set the <em>-k</em> modes for files by setting the <tt>gitcvs.usecrlfattr</tt> config variable. In this case, if <tt>crlf</tt> is explicitly unset (<em>-crlf</em>), then the server will set <em>-kb</em> mode for binary files. If <tt>crlf</tt> is set, then the <em>-k</em> mode will explicitly be left blank. See also <a href="gitattributes.html">gitattributes(5)</a> for more information about the <tt>crlf</tt> -attribute.</p> -<p>Alternatively, if <tt>gitcvs.usecrlfattr</tt> config is not enabled +attribute.</p></div> +<div class="para"><p>Alternatively, if <tt>gitcvs.usecrlfattr</tt> config is not enabled or if the <tt>crlf</tt> attribute is unspecified for a filename, then the server uses the <tt>gitcvs.allbinary</tt> config for the default setting. If <tt>gitcvs.allbinary</tt> is set, then file not otherwise specified will default to <em>-kb</em> mode. Otherwise the <em>-k</em> mode is left blank. But if <tt>gitcvs.allbinary</tt> is set to "guess", then the correct <em>-k</em> mode will be guessed based on the contents of -the file.</p> -<p>For best consistency with <tt>cvs</tt>, it is probably best to override the +the file.</p></div> +<div class="para"><p>For best consistency with <em>cvs</em>, it is probably best to override the defaults by setting <tt>gitcvs.usecrlfattr</tt> to true, -and <tt>gitcvs.allbinary</tt> to "guess".</p> +and <tt>gitcvs.allbinary</tt> to "guess".</p></div> </div> -<h2>Dependencies</h2> +<h2 id="_dependencies">Dependencies</h2> <div class="sectionbody"> -<p><tt>git-cvsserver</tt> depends on DBD::SQLite.</p> +<div class="para"><p><em>git-cvsserver</em> depends on DBD::SQLite.</p></div> </div> -<h2>Copyright and Authors</h2> +<h2 id="_copyright_and_authors">Copyright and Authors</h2> <div class="sectionbody"> -<p>This program is copyright The Open University UK - 2006.</p> -<p>Authors:</p> -<ul> +<div class="para"><p>This program is copyright The Open University UK - 2006.</p></div> +<div class="para"><p>Authors:</p></div> +<div class="ilist"><ul> <li> <p> Martyn Smith <martyn@catalyst.net.nz> @@ -722,20 +772,20 @@ Martin Langhoff <martin@catalyst.net.nz> </p> </li> -</ul> -<p>with ideas and patches from participants of the git-list <git@vger.kernel.org>.</p> +</ul></div> +<div class="para"><p>with ideas and patches from participants of the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Martyn Smith <martyn@catalyst.net.nz>, Martin Langhoff <martin@catalyst.net.nz>, and Matthias Urlichs <smurf@smurf.noris.de>.</p> +<div class="para"><p>Documentation by Martyn Smith <martyn@catalyst.net.nz>, Martin Langhoff <martin@catalyst.net.nz>, and Matthias Urlichs <smurf@smurf.noris.de>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:39 UTC +Last updated 2008-07-06 05:16:41 UTC </div> </div> </body> diff --git a/git-cvsserver.txt b/git-cvsserver.txt index e0e35db..c2d3c90 100644 --- a/git-cvsserver.txt +++ b/git-cvsserver.txt
@@ -77,7 +77,7 @@ CVS clients cannot tag, branch or perform GIT merges. -`git-cvsserver` maps GIT branches to CVS modules. This is very different +'git-cvsserver' maps GIT branches to CVS modules. This is very different from what most CVS users would expect since in CVS modules usually represent one or more directories. @@ -103,7 +103,7 @@ ------ No special setup is needed for SSH access, other than having GIT tools in the PATH. If you have clients that do not accept the CVS_SERVER -environment variable, you can rename `git-cvsserver` to `cvs`. +environment variable, you can rename 'git-cvsserver' to `cvs`. Note: Newer CVS versions (>= 1.12.11) also support specifying CVS_SERVER directly in CVSROOT like @@ -113,9 +113,9 @@ ------ This has the advantage that it will be saved in your 'CVS/Root' files and you don't need to worry about always setting the correct environment -variable. SSH users restricted to `git-shell` don't need to override the default -with CVS_SERVER (and shouldn't) as `git-shell` understands `cvs` to mean -`git-cvsserver` and pretends that the other end runs the real `cvs` better. +variable. SSH users restricted to 'git-shell' don't need to override the default +with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to mean +'git-cvsserver' and pretends that the other end runs the real 'cvs' better. -- 2. For each repo that you want accessible from CVS you need to edit config in the repo and add the following section. @@ -128,11 +128,14 @@ logfile=/path/to/logfile ------ -Note: you need to ensure each user that is going to invoke `git-cvsserver` has +Note: you need to ensure each user that is going to invoke 'git-cvsserver' has write access to the log file and to the database (see <<dbbackend,Database Backend>>. If you want to offer write access over SSH, the users of course also need write access to the git repository itself. +You also need to ensure that each repository is "bare" (without a git index +file) for `cvs commit` to work. See linkgit:gitcvs-migration[7]. + [[configaccessmethod]] All configuration variables can also be overridden for a specific method of access. Valid method names are "ext" (for SSH access) and "pserver". The @@ -150,7 +153,7 @@ automatically saving it in your 'CVS/Root' files, then you need to set them explicitly in your environment. CVSROOT should be set as per normal, but the directory should point at the appropriate git repo. As above, for SSH clients - _not_ restricted to `git-shell`, CVS_SERVER should be set to `git-cvsserver`. + _not_ restricted to 'git-shell', CVS_SERVER should be set to 'git-cvsserver'. + -- ------ @@ -178,27 +181,27 @@ Database Backend ---------------- -`git-cvsserver` uses one database per git head (i.e. CVS module) to +'git-cvsserver' uses one database per git head (i.e. CVS module) to store information about the repository for faster access. The database doesn't contain any persistent data and can be completely regenerated from the git repository at any time. The database needs to be updated (i.e. written to) after every commit. If the commit is done directly by using `git` (as opposed to -using `git-cvsserver`) the update will need to happen on the -next repository access by `git-cvsserver`, independent of +using 'git-cvsserver') the update will need to happen on the +next repository access by 'git-cvsserver', independent of access method and requested operation. That means that even if you offer only read access (e.g. by using -the pserver method), `git-cvsserver` should have write access to +the pserver method), 'git-cvsserver' should have write access to the database to work reliably (otherwise you need to make sure -that the database is up-to-date any time `git-cvsserver` is executed). +that the database is up-to-date any time 'git-cvsserver' is executed). By default it uses SQLite databases in the git directory, named `gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates temporary files in the same directory as the database file on write so it might not be enough to grant the users using -`git-cvsserver` write access to the database file without granting +'git-cvsserver' write access to the database file without granting them write access to the directory, too. You can configure the database backend with the following @@ -207,7 +210,7 @@ Configuring database backend ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -`git-cvsserver` uses the Perl DBI module. Please also read +'git-cvsserver' uses the Perl DBI module. Please also read its documentation if changing these variables, especially about `DBI->connect()`. @@ -259,7 +262,7 @@ %a:: access method (one of "ext" or "pserver") %u:: - Name of the user running `git-cvsserver`. + Name of the user running 'git-cvsserver'. If no name can be determined, the numeric uid is used. @@ -280,13 +283,13 @@ Protocol notes: If you are using anonymous access via pserver, just select that. Those using SSH access should choose the 'ext' protocol, and configure 'ext' access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to -`git-cvsserver`. Note that password support is not good when using 'ext', +'git-cvsserver'. Note that password support is not good when using 'ext', you will definitely want to have SSH keys setup. Alternatively, you can just use the non-standard extssh protocol that Eclipse offer. In that case CVS_SERVER is ignored, and you will have to replace -the cvs utility on the server with `git-cvsserver` or manipulate your `.bashrc` -so that calling 'cvs' effectively calls `git-cvsserver`. +the cvs utility on the server with 'git-cvsserver' or manipulate your `.bashrc` +so that calling 'cvs' effectively calls 'git-cvsserver'. Clients known to work --------------------- @@ -328,13 +331,13 @@ the correct '-k' mode will be guessed based on the contents of the file. -For best consistency with `cvs`, it is probably best to override the +For best consistency with 'cvs', it is probably best to override the defaults by setting `gitcvs.usecrlfattr` to true, and `gitcvs.allbinary` to "guess". Dependencies ------------ -`git-cvsserver` depends on DBD::SQLite. +'git-cvsserver' depends on DBD::SQLite. Copyright and Authors ---------------------
diff --git a/git-daemon.html b/git-daemon.html index dd84505..ab28133 100644 --- a/git-daemon.html +++ b/git-daemon.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-daemon(1)</title> </head> @@ -283,26 +331,26 @@ [--inetd | [--listen=host_or_ipaddr] [--port=n] [--user=user [--group=group]] [directory…]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>A really simple TCP git daemon that normally listens on port "DEFAULT_GIT_PORT" +<div class="para"><p>A really simple TCP git daemon that normally listens on port "DEFAULT_GIT_PORT" aka 9418. It waits for a connection asking for a service, and will serve -that service if it is enabled.</p> -<p>It verifies that the directory has the magic file "git-daemon-export-ok", and +that service if it is enabled.</p></div> +<div class="para"><p>It verifies that the directory has the magic file "git-daemon-export-ok", and it will refuse to export any git directory that hasn't explicitly been marked for export this way (unless the <em>--export-all</em> parameter is specified). If you -pass some directory paths as <tt>git-daemon</tt> arguments, you can further restrict -the offers to a whitelist comprising of those.</p> -<p>By default, only <tt>upload-pack</tt> service is enabled, which serves -<tt>git-fetch-pack</tt> and <tt>git-ls-remote</tt> clients, which are invoked -from <tt>git-fetch</tt>, <tt>git-pull</tt>, and <tt>git-clone</tt>.</p> -<p>This is ideally suited for read-only updates, i.e., pulling from -git repositories.</p> -<p>An <tt>upload-archive</tt> also exists to serve <tt>git-archive</tt>.</p> +pass some directory paths as <em>git-daemon</em> arguments, you can further restrict +the offers to a whitelist comprising of those.</p></div> +<div class="para"><p>By default, only <tt>upload-pack</tt> service is enabled, which serves +<em>git-fetch-pack</em> and <em>git-ls-remote</em> clients, which are invoked +from <em>git-fetch</em>, <em>git-pull</em>, and <em>git-clone</em>.</p></div> +<div class="para"><p>This is ideally suited for read-only updates, i.e., pulling from +git repositories.</p></div> +<div class="para"><p>An <tt>upload-archive</tt> also exists to serve <em>git-archive</em>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --strict-paths </dt> @@ -310,7 +358,7 @@ <p> Match paths exactly (i.e. don't allow "/foo/repo" when the real path is "/foo/repo.git" or "/foo/repo/.git") and don't do user-relative paths. - <tt>git-daemon</tt> will refuse to start when this option is enabled and no + <em>git-daemon</em> will refuse to start when this option is enabled and no whitelist is specified. </p> </dd> @@ -320,9 +368,9 @@ <dd> <p> Remap all the path requests as relative to the given path. - This is sort of "GIT root" - if you run <tt>git-daemon</tt> with + This is sort of "GIT root" - if you run <em>git-daemon</em> with <em>--base-path=/srv/git</em> on example.com, then if you later try to pull - <em>git://example.com/hello.git</em>, <tt>git-daemon</tt> will interpret the path + <em>git://example.com/hello.git</em>, <em>git-daemon</em> will interpret the path as <em>/srv/git/hello.git</em>. </p> </dd> @@ -332,7 +380,7 @@ <dd> <p> If --base-path is enabled and repo lookup fails, with this option - <tt>git-daemon</tt> will attempt to lookup without prefixing the base path. + <em>git-daemon</em> will attempt to lookup without prefixing the base path. This is useful for switching to --base-path usage, while still allowing the old paths. </p> @@ -428,9 +476,9 @@ </dt> <dd> <p> - Allow ~user notation to be used in requests. When + Allow <sub>user notation to be used in requests. When specified with no parameter, requests to - git://host/~alice/foo is taken as a request to access + git://host/</sub>alice/foo is taken as a request to access <em>foo</em> repository in the home directory of user <tt>alice</tt>. If <tt>--user-path=path</tt> is specified, the same request is taken as a request to access <tt>path/foo</tt> repository in @@ -486,9 +534,9 @@ the option are given to <tt>getpwnam(3)</tt> and <tt>getgrnam(3)</tt> and numeric IDs are not supported. </p> -<p>Giving these options is an error when used with <tt>--inetd</tt>; use +<div class="para"><p>Giving these options is an error when used with <tt>--inetd</tt>; use the facility of inet daemon to achieve the same before spawning -<tt>git-daemon</tt> if needed.</p> +<em>git-daemon</em> if needed.</p></div> </dd> <dt> --enable=service @@ -528,23 +576,23 @@ of each named directory. </p> </dd> -</dl> +</dl></div> </div> -<h2>SERVICES</h2> +<h2 id="_services">SERVICES</h2> <div class="sectionbody"> -<p>These services can be globally enabled/disabled using the +<div class="para"><p>These services can be globally enabled/disabled using the command line options of this command. If a finer-grained -control is desired (e.g. to allow <tt>git-archive</tt> to be run +control is desired (e.g. to allow <em>git-archive</em> to be run against only in a few selected repositories the daemon serves), the per-repository configuration file can be used to enable or -disable them.</p> -<dl> +disable them.</p></div> +<div class="vlist"><dl> <dt> upload-pack </dt> <dd> <p> - This serves <tt>git-fetch-pack</tt> and <tt>git-ls-remote</tt> + This serves <em>git-fetch-pack</em> and <em>git-ls-remote</em> clients. It is enabled by default, but a repository can disable it by setting <tt>daemon.uploadpack</tt> configuration item to <tt>false</tt>. @@ -555,7 +603,7 @@ </dt> <dd> <p> - This serves <tt>git-archive --remote</tt>. It is disabled by + This serves <em>git-archive --remote</em>. It is disabled by default, but a repository can enable it by setting <tt>daemon.uploadarch</tt> configuration item to <tt>true</tt>. </p> @@ -565,8 +613,8 @@ </dt> <dd> <p> - This serves <tt>git-send-pack</tt> clients, allowing anonymous - push. It is disabled by default, as there is _no_ + This serves <em>git-send-pack</em> clients, allowing anonymous + push. It is disabled by default, as there is <em>no</em> authentication in the protocol (in other words, anybody can push anything into the repository, including removal of refs). This is solely meant for a closed LAN setting @@ -575,11 +623,11 @@ <tt>true</tt>. </p> </dd> -</dl> +</dl></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> We assume the following in /etc/services </dt> @@ -591,11 +639,11 @@ </div></div> </dd> <dt> -<tt>git-daemon</tt> as inetd server +<em>git-daemon</em> as inetd server </dt> <dd> <p> - To set up <tt>git-daemon</tt> as an inetd service that handles any + To set up <em>git-daemon</em> as an inetd service that handles any repository under the whitelisted set of directories, /pub/foo and /pub/bar, place an entry like the following into /etc/inetd all on one line: @@ -608,11 +656,11 @@ </div></div> </dd> <dt> -<tt>git-daemon</tt> as inetd server for virtual hosts +<em>git-daemon</em> as inetd server for virtual hosts </dt> <dd> <p> - To set up <tt>git-daemon</tt> as an inetd service that handles + To set up <em>git-daemon</em> as an inetd service that handles repositories for different virtual hosts, <tt>www.example.com</tt> and <tt>www.example.org</tt>, place an entry like the following into <tt>/etc/inetd</tt> all on one line: @@ -626,19 +674,19 @@ /pub/www.example.com/software /software</tt></pre> </div></div> -<p>In this example, the root-level directory <tt>/pub</tt> will contain +<div class="para"><p>In this example, the root-level directory <tt>/pub</tt> will contain a subdirectory for each virtual host name supported. Further, both hosts advertise repositories simply as <tt>git://www.example.com/software/repo.git</tt>. For pre-1.4.0 clients, a symlink from <tt>/software</tt> into the appropriate -default repository could be made as well.</p> +default repository could be made as well.</p></div> </dd> <dt> -<tt>git-daemon</tt> as regular daemon for virtual hosts +<em>git-daemon</em> as regular daemon for virtual hosts </dt> <dd> <p> - To set up <tt>git-daemon</tt> as a regular, non-inetd service that + To set up <em>git-daemon</em> as a regular, non-inetd service that handles repositories for multiple virtual hosts based on their IP addresses, start the daemon like this: </p> @@ -649,17 +697,17 @@ /pub/192.168.1.200/software /pub/10.10.220.23/software</tt></pre> </div></div> -<p>In this example, the root-level directory <tt>/pub</tt> will contain +<div class="para"><p>In this example, the root-level directory <tt>/pub</tt> will contain a subdirectory for each virtual host IP address supported. Repositories can still be accessed by hostname though, assuming -they correspond to these IP addresses.</p> +they correspond to these IP addresses.</p></div> </dd> <dt> selectively enable/disable services per repository </dt> <dd> <p> - To enable <tt>git-archive --remote</tt> and disable <tt>git-fetch</tt> against + To enable <em>git-archive --remote</em> and disable <em>git-fetch</em> against a repository, have the following in the configuration file in the repository (that is the file <em>config</em> next to <em>HEAD</em>, <em>refs</em> and <em>objects</em>). @@ -671,24 +719,24 @@ uploadarch = true</tt></pre> </div></div> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki -<yoshfuji@linux-ipv6.org> and the git-list <git@vger.kernel.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki +<yoshfuji@linux-ipv6.org> and the git-list <git@vger.kernel.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:39 UTC +Last updated 2008-07-06 05:16:42 UTC </div> </div> </body> diff --git a/git-daemon.txt b/git-daemon.txt index 3cf2d3b..4ba4b75 100644 --- a/git-daemon.txt +++ b/git-daemon.txt
@@ -27,36 +27,36 @@ It verifies that the directory has the magic file "git-daemon-export-ok", and it will refuse to export any git directory that hasn't explicitly been marked for export this way (unless the '--export-all' parameter is specified). If you -pass some directory paths as `git-daemon` arguments, you can further restrict +pass some directory paths as 'git-daemon' arguments, you can further restrict the offers to a whitelist comprising of those. By default, only `upload-pack` service is enabled, which serves -`git-fetch-pack` and `git-ls-remote` clients, which are invoked -from `git-fetch`, `git-pull`, and `git-clone`. +'git-fetch-pack' and 'git-ls-remote' clients, which are invoked +from 'git-fetch', 'git-pull', and 'git-clone'. This is ideally suited for read-only updates, i.e., pulling from git repositories. -An `upload-archive` also exists to serve `git-archive`. +An `upload-archive` also exists to serve 'git-archive'. OPTIONS ------- --strict-paths:: Match paths exactly (i.e. don't allow "/foo/repo" when the real path is "/foo/repo.git" or "/foo/repo/.git") and don't do user-relative paths. - `git-daemon` will refuse to start when this option is enabled and no + 'git-daemon' will refuse to start when this option is enabled and no whitelist is specified. --base-path:: Remap all the path requests as relative to the given path. - This is sort of "GIT root" - if you run `git-daemon` with + This is sort of "GIT root" - if you run 'git-daemon' with '--base-path=/srv/git' on example.com, then if you later try to pull - 'git://example.com/hello.git', `git-daemon` will interpret the path + 'git://example.com/hello.git', 'git-daemon' will interpret the path as '/srv/git/hello.git'. --base-path-relaxed:: If --base-path is enabled and repo lookup fails, with this option - `git-daemon` will attempt to lookup without prefixing the base path. + 'git-daemon' will attempt to lookup without prefixing the base path. This is useful for switching to --base-path usage, while still allowing the old paths. @@ -138,7 +138,7 @@ + Giving these options is an error when used with `--inetd`; use the facility of inet daemon to achieve the same before spawning -`git-daemon` if needed. +'git-daemon' if needed. --enable=service:: --disable=service:: @@ -164,24 +164,24 @@ These services can be globally enabled/disabled using the command line options of this command. If a finer-grained -control is desired (e.g. to allow `git-archive` to be run +control is desired (e.g. to allow 'git-archive' to be run against only in a few selected repositories the daemon serves), the per-repository configuration file can be used to enable or disable them. upload-pack:: - This serves `git-fetch-pack` and `git-ls-remote` + This serves 'git-fetch-pack' and 'git-ls-remote' clients. It is enabled by default, but a repository can disable it by setting `daemon.uploadpack` configuration item to `false`. upload-archive:: - This serves `git-archive --remote`. It is disabled by + This serves 'git-archive --remote'. It is disabled by default, but a repository can enable it by setting `daemon.uploadarch` configuration item to `true`. receive-pack:: - This serves `git-send-pack` clients, allowing anonymous + This serves 'git-send-pack' clients, allowing anonymous push. It is disabled by default, as there is _no_ authentication in the protocol (in other words, anybody can push anything into the repository, including removal @@ -199,8 +199,8 @@ git 9418/tcp # Git Version Control System ------------ -`git-daemon` as inetd server:: - To set up `git-daemon` as an inetd service that handles any +'git-daemon' as inetd server:: + To set up 'git-daemon' as an inetd service that handles any repository under the whitelisted set of directories, /pub/foo and /pub/bar, place an entry like the following into /etc/inetd all on one line: @@ -212,8 +212,8 @@ ------------------------------------------------ -`git-daemon` as inetd server for virtual hosts:: - To set up `git-daemon` as an inetd service that handles +'git-daemon' as inetd server for virtual hosts:: + To set up 'git-daemon' as an inetd service that handles repositories for different virtual hosts, `www.example.com` and `www.example.org`, place an entry like the following into `/etc/inetd` all on one line: @@ -235,8 +235,8 @@ default repository could be made as well. -`git-daemon` as regular daemon for virtual hosts:: - To set up `git-daemon` as a regular, non-inetd service that +'git-daemon' as regular daemon for virtual hosts:: + To set up 'git-daemon' as a regular, non-inetd service that handles repositories for multiple virtual hosts based on their IP addresses, start the daemon like this: + @@ -253,7 +253,7 @@ they correspond to these IP addresses. selectively enable/disable services per repository:: - To enable `git-archive --remote` and disable `git-fetch` against + To enable 'git-archive --remote' and disable 'git-fetch' against a repository, have the following in the configuration file in the repository (that is the file 'config' next to 'HEAD', 'refs' and 'objects').
diff --git a/git-describe.html b/git-describe.html index d5b85a7..3ea45a4 100644 --- a/git-describe.html +++ b/git-describe.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-describe(1)</title> </head> @@ -272,19 +320,19 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git describe</em> [--all] [--tags] [--contains] [--abbrev=<n>] <committish>…</p> +<div class="para"><p><em>git describe</em> [--all] [--tags] [--contains] [--abbrev=<n>] <committish>…</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>The command finds the most recent tag that is reachable from a +<div class="para"><p>The command finds the most recent tag that is reachable from a commit. If the tag points to the commit, then only the tag is shown. Otherwise, it suffixes the tag name with the number of additional commits on top of the tagged object and the -abbreviated object name of the most recent commit.</p> +abbreviated object name of the most recent commit.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <committish> </dt> @@ -392,33 +440,33 @@ Show uniquely abbreviated commit object as fallback. </p> </dd> -</dl> +</dl></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<p>With something like git.git current tree, I get:</p> +<div class="para"><p>With something like git.git current tree, I get:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>[torvalds@g5 git]$ git describe parent v1.0.4-14-g2414721</tt></pre> </div></div> -<p>i.e. the current head of my "parent" branch is based on v1.0.4, +<div class="para"><p>i.e. the current head of my "parent" branch is based on v1.0.4, but since it has a handful commits on top of that, describe has added the number of additional commits ("14") and an abbreviated object name for the commit itself ("2414721") -at the end.</p> -<p>The number of additional commits is the number +at the end.</p></div> +<div class="para"><p>The number of additional commits is the number of commits which would be displayed by "git log v1.0.4..parent". The hash suffix is "-g" + 7-char abbreviation for the tip commit -of parent (which was <tt>2414721b194453f058079d897d13c4e377f92dc6</tt>).</p> -<p>Doing a <tt>git-describe</tt> on a tag-name will just show the tag name:</p> +of parent (which was <tt>2414721b194453f058079d897d13c4e377f92dc6</tt>).</p></div> +<div class="para"><p>Doing a <em>git-describe</em> on a tag-name will just show the tag name:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>[torvalds@g5 git]$ git describe v1.0.4 v1.0.4</tt></pre> </div></div> -<p>With --all, the command can use branch heads as references, so -the output shows the reference path as well:</p> +<div class="para"><p>With --all, the command can use branch heads as references, so +the output shows the reference path as well:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2 @@ -429,48 +477,48 @@ <pre><tt>[torvalds@g5 git]$ git describe --all HEAD^ heads/lt/describe-7-g975b</tt></pre> </div></div> -<p>With --abbrev set to 0, the command can be used to find the -closest tagname without any suffix:</p> +<div class="para"><p>With --abbrev set to 0, the command can be used to find the +closest tagname without any suffix:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2 tags/v1.0.0</tt></pre> </div></div> </div> -<h2>SEARCH STRATEGY</h2> +<h2 id="_search_strategy">SEARCH STRATEGY</h2> <div class="sectionbody"> -<p>For each committish supplied, <tt>git-describe</tt> will first look for +<div class="para"><p>For each committish supplied, <em>git-describe</em> will first look for a tag which tags exactly that commit. Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates. If an exact match -is found, its name will be output and searching will stop.</p> -<p>If an exact match was not found, <tt>git-describe</tt> will walk back +is found, its name will be output and searching will stop.</p></div> +<div class="para"><p>If an exact match was not found, <em>git-describe</em> will walk back through the commit history to locate an ancestor commit which has been tagged. The ancestor's tag will be output along with an -abbreviation of the input committish's SHA1.</p> -<p>If multiple tags were found during the walk then the tag which +abbreviation of the input committish's SHA1.</p></div> +<div class="para"><p>If multiple tags were found during the walk then the tag which has the fewest commits different from the input committish will be selected and output. Here fewest commits different is defined as the number of commits which would be shown by <tt>git log tag..input</tt> -will be the smallest number of commits possible.</p> +will be the smallest number of commits possible.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org>, but somewhat +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>, but somewhat butchered by Junio C Hamano <junkio@cox.net>. Later significantly -updated by Shawn Pearce <spearce@spearce.org>.</p> +updated by Shawn Pearce <spearce@spearce.org>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:40 UTC +Last updated 2008-07-06 05:16:42 UTC </div> </div> </body> diff --git a/git-describe.txt b/git-describe.txt index 51a0cc0..44b1668 100644 --- a/git-describe.txt +++ b/git-describe.txt
@@ -92,7 +92,7 @@ The hash suffix is "-g" + 7-char abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). -Doing a `git-describe` on a tag-name will just show the tag name: +Doing a 'git-describe' on a tag-name will just show the tag name: [torvalds@g5 git]$ git describe v1.0.4 v1.0.4 @@ -115,13 +115,13 @@ SEARCH STRATEGY --------------- -For each committish supplied, `git-describe` will first look for +For each committish supplied, 'git-describe' will first look for a tag which tags exactly that commit. Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates. If an exact match is found, its name will be output and searching will stop. -If an exact match was not found, `git-describe` will walk back +If an exact match was not found, 'git-describe' will walk back through the commit history to locate an ancestor commit which has been tagged. The ancestor's tag will be output along with an abbreviation of the input committish's SHA1.
diff --git a/git-diff-files.html b/git-diff-files.html index 993785d..fb9ca34 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-diff-files(1)</title> </head> @@ -272,18 +320,18 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>…]</p> +<div class="para"><p><em>git diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>…]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Compares the files in the working tree and the index. When paths +<div class="para"><p>Compares the files in the working tree and the index. When paths are specified, compares only those named paths. Otherwise all entries in the index are compared. The output format is the -same as for <tt>git-diff-index</tt> and <tt>git-diff-tree</tt>.</p> +same as for <em>git-diff-index</em> and <em>git-diff-tree</em>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -p </dt> @@ -755,10 +803,10 @@ Do not show any source or destination prefix. </p> </dd> -</dl> -<p>For more detailed explanation on these common options, see also -<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p> -<dl> +</dl></div> +<div class="para"><p>For more detailed explanation on these common options, see also +<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div> +<div class="vlist"><dl> <dt> -1 -2 -3 or --base --ours --theirs, and -0 </dt> @@ -768,9 +816,9 @@ branch" respectively. With these options, diffs for merged entries are not shown. </p> -<p>The default is to diff against our branch (-2) and the +<div class="para"><p>The default is to diff against our branch (-2) and the cleanly resolved paths. The option -0 can be given to -omit diff output for unmerged entries and just show "Unmerged".</p> +omit diff output for unmerged entries and just show "Unmerged".</p></div> </dd> <dt> -c @@ -794,15 +842,15 @@ Remain silent even on nonexistent files </p> </dd> -</dl> +</dl></div> </div> -<h2>Output format</h2> +<h2 id="_output_format">Output format</h2> <div class="sectionbody"> -<p>The output format from "git-diff-index", "git-diff-tree", -"git-diff-files" and "git diff --raw" are very similar.</p> -<p>These commands all compare two sets of things; what is -compared differs:</p> -<dl> +<div class="para"><p>The output format from "git-diff-index", "git-diff-tree", +"git-diff-files" and "git diff --raw" are very similar.</p></div> +<div class="para"><p>These commands all compare two sets of things; what is +compared differs:</p></div> +<div class="vlist"><dl> <dt> git-diff-index <tree-ish> </dt> @@ -835,8 +883,8 @@ compares the index and the files on the filesystem. </p> </dd> -</dl> -<p>An output line is formatted this way:</p> +</dl></div> +<div class="para"><p>An output line is formatted this way:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0 @@ -846,8 +894,8 @@ delete :100644 000000 1234567... 0000000... D file5 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre> </div></div> -<p>That is, from the left to the right:</p> -<ol> +<div class="para"><p>That is, from the left to the right:</p></div> +<div class="olist"><ol> <li> <p> a colon. @@ -923,25 +971,25 @@ an LF or a NUL when <em>-z</em> option is used, to terminate the record. </p> </li> -</ol> -<p><sha1> is shown as all 0's if a file is new on the filesystem -and it is out of sync with the index.</p> -<p>Example:</p> +</ol></div> +<div class="para"><p><sha1> is shown as all 0's if a file is new on the filesystem +and it is out of sync with the index.</p></div> +<div class="para"><p>Example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre> </div></div> -<p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters +<div class="para"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, -respectively.</p> +respectively.</p></div> </div> -<h2>diff format for merges</h2> +<h2 id="_diff_format_for_merges">diff format for merges</h2> <div class="sectionbody"> -<p>"git-diff-tree", "git-diff-files" and "git-diff --raw" +<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw" can take <em>-c</em> or <em>--cc</em> option to generate diff output also for merge commits. The output differs -from the format described above in the following way:</p> -<ol> +from the format described above in the following way:</p></div> +<div class="olist"><ol> <li> <p> there is a colon for each parent @@ -967,26 +1015,26 @@ single path, only for "dst" </p> </li> -</ol> -<p>Example:</p> +</ol></div> +<div class="para"><p>Example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre> </div></div> -<p>Note that <em>combined diff</em> lists only files which were modified from -all parents.</p> +<div class="para"><p>Note that <em>combined diff</em> lists only files which were modified from +all parents.</p></div> </div> -<h2>Generating patches with -p</h2> +<h2 id="_generating_patches_with_p">Generating patches with -p</h2> <div class="sectionbody"> -<p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run +<div class="para"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a <em>-p</em> option, "git diff" without the <em>--raw</em> option, or "git log" with the "-p" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the -GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p> -<p>What the -p option produces is slightly different from the traditional -diff format.</p> -<ol> +GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div> +<div class="para"><p>What the -p option produces is slightly different from the traditional +diff format.</p></div> +<div class="olist"><ol> <li> <p> It is preceded with a "git diff" header, that looks like @@ -996,12 +1044,12 @@ <div class="content"> <pre><tt>diff --git a/file1 b/file2</tt></pre> </div></div> -<p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is +<div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, -<tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p> -<p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the +<tt>/dev/null</tt> is <em>not</em> used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div> +<div class="para"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the name of the source file of the rename/copy and the name of -the file that rename/copy produces, respectively.</p> +the file that rename/copy produces, respectively.</p></div> </li> <li> <p> @@ -1030,20 +1078,20 @@ pathname is put in double quotes. </p> </li> -</ol> -<p>The similarity index is the percentage of unchanged lines, and +</ol></div> +<div class="para"><p>The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old -file made it into the new one.</p> +file made it into the new one.</p></div> </div> -<h2>combined diff format</h2> +<h2 id="_combined_diff_format">combined diff format</h2> <div class="sectionbody"> -<p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or +<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or <em>--cc</em> option to produce <em>combined diff</em>. For showing a merge commit with "git log -p", this is the default format. -A <em>combined diff</em> format looks like this:</p> +A <em>combined diff</em> format looks like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>diff --combined describe.c @@ -1074,7 +1122,7 @@ initialized = 1; for_each_ref(get_name);</tt></pre> </div></div> -<ol> +<div class="olist"><ol> <li> <p> It is preceded with a "git diff" header, that looks like @@ -1084,7 +1132,7 @@ <div class="content"> <pre><tt>diff --combined file</tt></pre> </div></div> -<p>or like this (when <em>--cc</em> option is used):</p> +<div class="para"><p>or like this (when <em>--cc</em> option is used):</p></div> <div class="literalblock"> <div class="content"> <pre><tt>diff --c file</tt></pre> @@ -1102,11 +1150,11 @@ new file mode <mode> deleted file mode <mode>,<mode></tt></pre> </div></div> -<p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of +<div class="para"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two -<tree-ish> and are not used by combined diff format.</p> +<tree-ish> and are not used by combined diff format.</p></div> </li> <li> <p> @@ -1117,9 +1165,9 @@ <pre><tt>--- a/file +++ b/file</tt></pre> </div></div> -<p>Similar to two-line header for traditional <em>unified</em> diff +<div class="para"><p>Similar to two-line header for traditional <em>unified</em> diff format, <tt>/dev/null</tt> is used to signal created or deleted -files.</p> +files.</p></div> </li> <li> <p> @@ -1133,59 +1181,59 @@ <div class="content"> <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre> </div></div> -<p>There are (number of parents + 1) <tt>@</tt> characters in the chunk -header for combined diff format.</p> +<div class="para"><p>There are (number of parents + 1) <tt>@</tt> characters in the chunk +header for combined diff format.</p></div> </li> -</ol> -<p>Unlike the traditional <em>unified</em> diff format, which shows two +</ol></div> +<div class="para"><p>Unlike the traditional <em>unified</em> diff format, which shows two files A and B with a single column that has <tt>-</tt> (minus — appears in A but removed in B), <tt>+</tt> (plus — missing in A but added to B), or <tt>" "</tt> (space — unchanged) prefix, this format compares two or more files file1, file2,… with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is -different from it.</p> -<p>A <tt>-</tt> character in the column N means that the line appears in +different from it.</p></div> +<div class="para"><p>A <tt>-</tt> character in the column N means that the line appears in fileN but it does not appear in the result. A <tt>+</tt> character in the column N means that the line appears in the last file, and fileN does not have that line (in other words, the line was -added, from the point of view of that parent).</p> -<p>In the above example output, the function signature was changed +added, from the point of view of that parent).</p></div> +<div class="para"><p>In the above example output, the function signature was changed from both files (hence two <tt>-</tt> removals from both file1 and -file2, plus <tt>++</tt> to mean one line that was added does not appear +file2, plus <tt><tt>+</tt> to mean one line that was added does not appear in either file1 nor file2). Also two other lines are the same -from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p> -<p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a +from file1 but do not appear in file2 (hence prefixed with <tt> </tt></tt>).</p></div> +<div class="para"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by <tt>git diff-files -c</tt>, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka -"their version").</p> +"their version").</p></div> </div> -<h2>other diff formats</h2> +<h2 id="_other_diff_formats">other diff formats</h2> <div class="sectionbody"> -<p>The <tt>--summary</tt> option describes newly added, deleted, renamed and +<div class="para"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and copied files. The <tt>--stat</tt> option adds diffstat(1) graph to the output. These options can be combined with other options, such as -<tt>-p</tt>, and are meant for human consumption.</p> -<p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output +<tt>-p</tt>, and are meant for human consumption.</p></div> +<div class="para"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output formats the pathnames compactly by combining common prefix and suffix of the pathnames. For example, a change that moves <tt>arch/i386/Makefile</tt> to -<tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p> +<tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>arch/{i386 => x86}/Makefile | 4 +--</tt></pre> </div></div> -<p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed +<div class="para"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed for easier machine consumption. An entry in <tt>--numstat</tt> output looks -like this:</p> +like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>1 2 README 3 1 arch/{i386 => x86}/Makefile</tt></pre> </div></div> -<p>That is, from left to right:</p> -<ol> +<div class="para"><p>That is, from left to right:</p></div> +<div class="olist"><ol> <li> <p> the number of added lines; @@ -1216,15 +1264,15 @@ a newline. </p> </li> -</ol> -<p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p> +</ol></div> +<div class="para"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>1 2 README NUL 3 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</tt></pre> </div></div> -<p>That is:</p> -<ol> +<div class="para"><p>That is:</p></div> +<div class="olist"><ol> <li> <p> the number of added lines; @@ -1270,28 +1318,28 @@ a NUL. </p> </li> -</ol> -<p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow +</ol></div> +<div class="para"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to <tt>NUL</tt> would yield -the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p> +the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:40 UTC +Last updated 2008-07-06 05:16:43 UTC </div> </div> </body> diff --git a/git-diff-files.txt b/git-diff-files.txt index 6c65757..5c8c1d9 100644 --- a/git-diff-files.txt +++ b/git-diff-files.txt
@@ -15,7 +15,7 @@ Compares the files in the working tree and the index. When paths are specified, compares only those named paths. Otherwise all entries in the index are compared. The output format is the -same as for `git-diff-index` and `git-diff-tree`. +same as for 'git-diff-index' and 'git-diff-tree'. OPTIONS -------
diff --git a/git-diff-index.html b/git-diff-index.html index 7ca8982..83f7c15 100644 --- a/git-diff-index.html +++ b/git-diff-index.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-diff-index(1)</title> </head> @@ -272,19 +320,19 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git diff-index</em> [-m] [--cached] [<common diff options>] <tree-ish> [<path>…]</p> +<div class="para"><p><em>git diff-index</em> [-m] [--cached] [<common diff options>] <tree-ish> [<path>…]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Compares the content and mode of the blobs found via a tree +<div class="para"><p>Compares the content and mode of the blobs found via a tree object with the content of the current index and, optionally ignoring the stat state of the file on disk. When paths are specified, compares only those named paths. Otherwise all -entries in the index are compared.</p> +entries in the index are compared.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -p </dt> @@ -756,10 +804,10 @@ Do not show any source or destination prefix. </p> </dd> -</dl> -<p>For more detailed explanation on these common options, see also -<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p> -<dl> +</dl></div> +<div class="para"><p>For more detailed explanation on these common options, see also +<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div> +<div class="vlist"><dl> <dt> <tree-ish> </dt> @@ -783,19 +831,19 @@ <p> By default, files recorded in the index but not checked out are reported as deleted. This flag makes - <tt>git-diff-index</tt> say that all non-checked-out files are up + <em>git-diff-index</em> say that all non-checked-out files are up to date. </p> </dd> -</dl> +</dl></div> </div> -<h2>Output format</h2> +<h2 id="_output_format">Output format</h2> <div class="sectionbody"> -<p>The output format from "git-diff-index", "git-diff-tree", -"git-diff-files" and "git diff --raw" are very similar.</p> -<p>These commands all compare two sets of things; what is -compared differs:</p> -<dl> +<div class="para"><p>The output format from "git-diff-index", "git-diff-tree", +"git-diff-files" and "git diff --raw" are very similar.</p></div> +<div class="para"><p>These commands all compare two sets of things; what is +compared differs:</p></div> +<div class="vlist"><dl> <dt> git-diff-index <tree-ish> </dt> @@ -828,8 +876,8 @@ compares the index and the files on the filesystem. </p> </dd> -</dl> -<p>An output line is formatted this way:</p> +</dl></div> +<div class="para"><p>An output line is formatted this way:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0 @@ -839,8 +887,8 @@ delete :100644 000000 1234567... 0000000... D file5 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre> </div></div> -<p>That is, from the left to the right:</p> -<ol> +<div class="para"><p>That is, from the left to the right:</p></div> +<div class="olist"><ol> <li> <p> a colon. @@ -916,25 +964,25 @@ an LF or a NUL when <em>-z</em> option is used, to terminate the record. </p> </li> -</ol> -<p><sha1> is shown as all 0's if a file is new on the filesystem -and it is out of sync with the index.</p> -<p>Example:</p> +</ol></div> +<div class="para"><p><sha1> is shown as all 0's if a file is new on the filesystem +and it is out of sync with the index.</p></div> +<div class="para"><p>Example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre> </div></div> -<p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters +<div class="para"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, -respectively.</p> +respectively.</p></div> </div> -<h2>diff format for merges</h2> +<h2 id="_diff_format_for_merges">diff format for merges</h2> <div class="sectionbody"> -<p>"git-diff-tree", "git-diff-files" and "git-diff --raw" +<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw" can take <em>-c</em> or <em>--cc</em> option to generate diff output also for merge commits. The output differs -from the format described above in the following way:</p> -<ol> +from the format described above in the following way:</p></div> +<div class="olist"><ol> <li> <p> there is a colon for each parent @@ -960,26 +1008,26 @@ single path, only for "dst" </p> </li> -</ol> -<p>Example:</p> +</ol></div> +<div class="para"><p>Example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre> </div></div> -<p>Note that <em>combined diff</em> lists only files which were modified from -all parents.</p> +<div class="para"><p>Note that <em>combined diff</em> lists only files which were modified from +all parents.</p></div> </div> -<h2>Generating patches with -p</h2> +<h2 id="_generating_patches_with_p">Generating patches with -p</h2> <div class="sectionbody"> -<p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run +<div class="para"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a <em>-p</em> option, "git diff" without the <em>--raw</em> option, or "git log" with the "-p" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the -GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p> -<p>What the -p option produces is slightly different from the traditional -diff format.</p> -<ol> +GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div> +<div class="para"><p>What the -p option produces is slightly different from the traditional +diff format.</p></div> +<div class="olist"><ol> <li> <p> It is preceded with a "git diff" header, that looks like @@ -989,12 +1037,12 @@ <div class="content"> <pre><tt>diff --git a/file1 b/file2</tt></pre> </div></div> -<p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is +<div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, -<tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p> -<p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the +<tt>/dev/null</tt> is <em>not</em> used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div> +<div class="para"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the name of the source file of the rename/copy and the name of -the file that rename/copy produces, respectively.</p> +the file that rename/copy produces, respectively.</p></div> </li> <li> <p> @@ -1023,20 +1071,20 @@ pathname is put in double quotes. </p> </li> -</ol> -<p>The similarity index is the percentage of unchanged lines, and +</ol></div> +<div class="para"><p>The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old -file made it into the new one.</p> +file made it into the new one.</p></div> </div> -<h2>combined diff format</h2> +<h2 id="_combined_diff_format">combined diff format</h2> <div class="sectionbody"> -<p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or +<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or <em>--cc</em> option to produce <em>combined diff</em>. For showing a merge commit with "git log -p", this is the default format. -A <em>combined diff</em> format looks like this:</p> +A <em>combined diff</em> format looks like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>diff --combined describe.c @@ -1067,7 +1115,7 @@ initialized = 1; for_each_ref(get_name);</tt></pre> </div></div> -<ol> +<div class="olist"><ol> <li> <p> It is preceded with a "git diff" header, that looks like @@ -1077,7 +1125,7 @@ <div class="content"> <pre><tt>diff --combined file</tt></pre> </div></div> -<p>or like this (when <em>--cc</em> option is used):</p> +<div class="para"><p>or like this (when <em>--cc</em> option is used):</p></div> <div class="literalblock"> <div class="content"> <pre><tt>diff --c file</tt></pre> @@ -1095,11 +1143,11 @@ new file mode <mode> deleted file mode <mode>,<mode></tt></pre> </div></div> -<p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of +<div class="para"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two -<tree-ish> and are not used by combined diff format.</p> +<tree-ish> and are not used by combined diff format.</p></div> </li> <li> <p> @@ -1110,9 +1158,9 @@ <pre><tt>--- a/file +++ b/file</tt></pre> </div></div> -<p>Similar to two-line header for traditional <em>unified</em> diff +<div class="para"><p>Similar to two-line header for traditional <em>unified</em> diff format, <tt>/dev/null</tt> is used to signal created or deleted -files.</p> +files.</p></div> </li> <li> <p> @@ -1126,59 +1174,59 @@ <div class="content"> <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre> </div></div> -<p>There are (number of parents + 1) <tt>@</tt> characters in the chunk -header for combined diff format.</p> +<div class="para"><p>There are (number of parents + 1) <tt>@</tt> characters in the chunk +header for combined diff format.</p></div> </li> -</ol> -<p>Unlike the traditional <em>unified</em> diff format, which shows two +</ol></div> +<div class="para"><p>Unlike the traditional <em>unified</em> diff format, which shows two files A and B with a single column that has <tt>-</tt> (minus — appears in A but removed in B), <tt>+</tt> (plus — missing in A but added to B), or <tt>" "</tt> (space — unchanged) prefix, this format compares two or more files file1, file2,… with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is -different from it.</p> -<p>A <tt>-</tt> character in the column N means that the line appears in +different from it.</p></div> +<div class="para"><p>A <tt>-</tt> character in the column N means that the line appears in fileN but it does not appear in the result. A <tt>+</tt> character in the column N means that the line appears in the last file, and fileN does not have that line (in other words, the line was -added, from the point of view of that parent).</p> -<p>In the above example output, the function signature was changed +added, from the point of view of that parent).</p></div> +<div class="para"><p>In the above example output, the function signature was changed from both files (hence two <tt>-</tt> removals from both file1 and -file2, plus <tt>++</tt> to mean one line that was added does not appear +file2, plus <tt><tt>+</tt> to mean one line that was added does not appear in either file1 nor file2). Also two other lines are the same -from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p> -<p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a +from file1 but do not appear in file2 (hence prefixed with <tt> </tt></tt>).</p></div> +<div class="para"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by <tt>git diff-files -c</tt>, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka -"their version").</p> +"their version").</p></div> </div> -<h2>other diff formats</h2> +<h2 id="_other_diff_formats">other diff formats</h2> <div class="sectionbody"> -<p>The <tt>--summary</tt> option describes newly added, deleted, renamed and +<div class="para"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and copied files. The <tt>--stat</tt> option adds diffstat(1) graph to the output. These options can be combined with other options, such as -<tt>-p</tt>, and are meant for human consumption.</p> -<p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output +<tt>-p</tt>, and are meant for human consumption.</p></div> +<div class="para"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output formats the pathnames compactly by combining common prefix and suffix of the pathnames. For example, a change that moves <tt>arch/i386/Makefile</tt> to -<tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p> +<tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>arch/{i386 => x86}/Makefile | 4 +--</tt></pre> </div></div> -<p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed +<div class="para"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed for easier machine consumption. An entry in <tt>--numstat</tt> output looks -like this:</p> +like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>1 2 README 3 1 arch/{i386 => x86}/Makefile</tt></pre> </div></div> -<p>That is, from left to right:</p> -<ol> +<div class="para"><p>That is, from left to right:</p></div> +<div class="olist"><ol> <li> <p> the number of added lines; @@ -1209,15 +1257,15 @@ a newline. </p> </li> -</ol> -<p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p> +</ol></div> +<div class="para"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>1 2 README NUL 3 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</tt></pre> </div></div> -<p>That is:</p> -<ol> +<div class="para"><p>That is:</p></div> +<div class="olist"><ol> <li> <p> the number of added lines; @@ -1263,92 +1311,92 @@ a NUL. </p> </li> -</ol> -<p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow +</ol></div> +<div class="para"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to <tt>NUL</tt> would yield -the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p> +the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></div> </div> -<h2>Operating Modes</h2> +<h2 id="_operating_modes">Operating Modes</h2> <div class="sectionbody"> -<p>You can choose whether you want to trust the index file entirely +<div class="para"><p>You can choose whether you want to trust the index file entirely (using the <em>--cached</em> flag) or ask the diff logic to show any files that don't match the stat state as being "tentatively changed". Both -of these operations are very useful indeed.</p> +of these operations are very useful indeed.</p></div> </div> -<h2>Cached Mode</h2> +<h2 id="_cached_mode">Cached Mode</h2> <div class="sectionbody"> -<p>If <em>--cached</em> is specified, it allows you to ask:</p> +<div class="para"><p>If <em>--cached</em> is specified, it allows you to ask:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>show me the differences between HEAD and the current index -contents (the ones I'd write using `git-write-tree`)</tt></pre> +contents (the ones I'd write using 'git-write-tree')</tt></pre> </div></div> -<p>For example, let's say that you have worked on your working directory, updated +<div class="para"><p>For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit. You want to see exactly <strong>what</strong> you are going to commit, without having to write a new tree -object and compare it that way, and to do that, you just do</p> +object and compare it that way, and to do that, you just do</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git diff-index --cached HEAD</tt></pre> </div></div> -<p>Example: let's say I had renamed <tt>commit.c</tt> to <tt>git-commit.c</tt>, and I had +<div class="para"><p>Example: let's say I had renamed <tt>commit.c</tt> to <tt>git-commit.c</tt>, and I had done an <tt>update-index</tt> to make that effective in the index file. <tt>git diff-files</tt> wouldn't show anything at all, since the index file -matches my working directory. But doing a <tt>git-diff-index</tt> does:</p> +matches my working directory. But doing a <em>git-diff-index</em> does:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>torvalds@ppc970:~/git> git diff-index --cached HEAD -100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c +100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c</tt></pre> </div></div> -<p>You can see easily that the above is a rename.</p> -<p>In fact, <tt>git diff-index --cached</tt> <strong>should</strong> always be entirely equivalent to -actually doing a <tt>git-write-tree</tt> and comparing that. Except this one is much -nicer for the case where you just want to check where you are.</p> -<p>So doing a <tt>git-diff-index --cached</tt> is basically very useful when you are +<div class="para"><p>You can see easily that the above is a rename.</p></div> +<div class="para"><p>In fact, <tt>git diff-index --cached</tt> <strong>should</strong> always be entirely equivalent to +actually doing a <em>git-write-tree</em> and comparing that. Except this one is much +nicer for the case where you just want to check where you are.</p></div> +<div class="para"><p>So doing a <em>git-diff-index --cached</em> is basically very useful when you are asking yourself "what have I already marked for being committed, and -what's the difference to a previous tree".</p> +what's the difference to a previous tree".</p></div> </div> -<h2>Non-cached Mode</h2> +<h2 id="_non_cached_mode">Non-cached Mode</h2> <div class="sectionbody"> -<p>The "non-cached" mode takes a different approach, and is potentially +<div class="para"><p>The "non-cached" mode takes a different approach, and is potentially the more useful of the two in that what it does can't be emulated with -a <tt>git-write-tree</tt> + <tt>git-diff-tree</tt>. Thus that's the default mode. -The non-cached version asks the question:</p> +a <em>git-write-tree</em> + <em>git-diff-tree</em>. Thus that's the default mode. +The non-cached version asks the question:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>show me the differences between HEAD and the currently checked out tree - index contents _and_ files that aren't up-to-date</tt></pre> </div></div> -<p>which is obviously a very useful question too, since that tells you what -you <strong>could</strong> commit. Again, the output matches the <tt>git-diff-tree -r</tt> -output to a tee, but with a twist.</p> -<p>The twist is that if some file doesn't match the index, we don't have +<div class="para"><p>which is obviously a very useful question too, since that tells you what +you <strong>could</strong> commit. Again, the output matches the <em>git-diff-tree -r</em> +output to a tee, but with a twist.</p></div> +<div class="para"><p>The twist is that if some file doesn't match the index, we don't have a backing store thing for it, and we use the magic "all-zero" sha1 to show that. So let's say that you have edited <tt>kernel/sched.c</tt>, but -have not actually done a <tt>git-update-index</tt> on it yet - there is no -"object" associated with the new state, and you get:</p> +have not actually done a <em>git-update-index</em> on it yet - there is no +"object" associated with the new state, and you get:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>torvalds@ppc970:~/v2.6/linux> git diff-index HEAD *100644->100664 blob 7476bb......->000000...... kernel/sched.c</tt></pre> </div></div> -<p>i.e., it shows that the tree has changed, and that <tt>kernel/sched.c</tt> has is +<div class="para"><p>i.e., it shows that the tree has changed, and that <tt>kernel/sched.c</tt> has is not up-to-date and may contain new stuff. The all-zero sha1 means that to get the real diff, you need to look at the object in the working directory -directly rather than do an object-to-object diff.</p> +directly rather than do an object-to-object diff.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <div class="title">Note</div> </td> -<td class="content">As with other commands of this type, <tt>git-diff-index</tt> does not +<td class="content">As with other commands of this type, <em>git-diff-index</em> does not actually look at the contents of the file at all. So maybe <tt>kernel/sched.c</tt> hasn't actually changed, and it's just that you touched it. In either case, it's a note that you need to -<tt>git-update-index</tt> it to make the index be in sync.</td> +<em>git-update-index</em> it to make the index be in sync.</td> </tr></table> </div> <div class="admonitionblock"> @@ -1364,21 +1412,21 @@ </tr></table> </div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:40 UTC +Last updated 2008-07-06 05:16:43 UTC </div> </div> </body> diff --git a/git-diff-index.txt b/git-diff-index.txt index 784bbf3..26920d4 100644 --- a/git-diff-index.txt +++ b/git-diff-index.txt
@@ -31,7 +31,7 @@ -m:: By default, files recorded in the index but not checked out are reported as deleted. This flag makes - `git-diff-index` say that all non-checked-out files are up + 'git-diff-index' say that all non-checked-out files are up to date. Output format @@ -50,7 +50,7 @@ If '--cached' is specified, it allows you to ask: show me the differences between HEAD and the current index - contents (the ones I'd write using `git-write-tree`) + contents (the ones I'd write using 'git-write-tree') For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit. You want to see exactly @@ -62,7 +62,7 @@ Example: let's say I had renamed `commit.c` to `git-commit.c`, and I had done an `update-index` to make that effective in the index file. `git diff-files` wouldn't show anything at all, since the index file -matches my working directory. But doing a `git-diff-index` does: +matches my working directory. But doing a 'git-diff-index' does: torvalds@ppc970:~/git> git diff-index --cached HEAD -100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c @@ -71,10 +71,10 @@ You can see easily that the above is a rename. In fact, `git diff-index --cached` *should* always be entirely equivalent to -actually doing a `git-write-tree` and comparing that. Except this one is much +actually doing a 'git-write-tree' and comparing that. Except this one is much nicer for the case where you just want to check where you are. -So doing a `git-diff-index --cached` is basically very useful when you are +So doing a 'git-diff-index --cached' is basically very useful when you are asking yourself "what have I already marked for being committed, and what's the difference to a previous tree". @@ -82,20 +82,20 @@ --------------- The "non-cached" mode takes a different approach, and is potentially the more useful of the two in that what it does can't be emulated with -a `git-write-tree` + `git-diff-tree`. Thus that's the default mode. +a 'git-write-tree' + 'git-diff-tree'. Thus that's the default mode. The non-cached version asks the question: show me the differences between HEAD and the currently checked out tree - index contents _and_ files that aren't up-to-date which is obviously a very useful question too, since that tells you what -you *could* commit. Again, the output matches the `git-diff-tree -r` +you *could* commit. Again, the output matches the 'git-diff-tree -r' output to a tee, but with a twist. The twist is that if some file doesn't match the index, we don't have a backing store thing for it, and we use the magic "all-zero" sha1 to show that. So let's say that you have edited `kernel/sched.c`, but -have not actually done a `git-update-index` on it yet - there is no +have not actually done a 'git-update-index' on it yet - there is no "object" associated with the new state, and you get: torvalds@ppc970:~/v2.6/linux> git diff-index HEAD @@ -106,11 +106,11 @@ get the real diff, you need to look at the object in the working directory directly rather than do an object-to-object diff. -NOTE: As with other commands of this type, `git-diff-index` does not +NOTE: As with other commands of this type, 'git-diff-index' does not actually look at the contents of the file at all. So maybe `kernel/sched.c` hasn't actually changed, and it's just that you touched it. In either case, it's a note that you need to -`git-update-index` it to make the index be in sync. +'git-update-index' it to make the index be in sync. NOTE: You can have a mixture of files show up as "has been updated" and "is still dirty in the working directory" together. You can always
diff --git a/git-diff-tree.html b/git-diff-tree.html index e9b55a9..931e3a2 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-diff-tree(1)</title> </head> @@ -277,16 +325,16 @@ [-t] [-r] [-c | --cc] [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>…]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Compares the content and mode of the blobs found via two tree objects.</p> -<p>If there is only one <tree-ish> given, the commit is compared with its parents -(see --stdin below).</p> -<p>Note that <tt>git-diff-tree</tt> can use the tree encapsulated in a commit object.</p> +<div class="para"><p>Compares the content and mode of the blobs found via two tree objects.</p></div> +<div class="para"><p>If there is only one <tree-ish> given, the commit is compared with its parents +(see --stdin below).</p></div> +<div class="para"><p>Note that <em>git-diff-tree</em> can use the tree encapsulated in a commit object.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -p </dt> @@ -758,10 +806,10 @@ Do not show any source or destination prefix. </p> </dd> -</dl> -<p>For more detailed explanation on these common options, see also -<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p> -<dl> +</dl></div> +<div class="para"><p>For more detailed explanation on these common options, see also +<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div> +<div class="vlist"><dl> <dt> <tree-ish> </dt> @@ -817,17 +865,17 @@ reads either one <commit> or a pair of <tree-ish> separated with a single space from its standard input. </p> -<p>When a single commit is given on one line of such input, it compares +<div class="para"><p>When a single commit is given on one line of such input, it compares the commit with its parents. The following flags further affects its behavior. This does not apply to the case where two <tree-ish> -separated with a single space are given.</p> +separated with a single space are given.</p></div> </dd> <dt> -m </dt> <dd> <p> - By default, <tt>git-diff-tree --stdin</tt> does not show + By default, <em>git-diff-tree --stdin</em> does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also <em>-c</em>. @@ -838,7 +886,7 @@ </dt> <dd> <p> - By default, <tt>git-diff-tree --stdin</tt> shows differences, + By default, <em>git-diff-tree --stdin</em> shows differences, either in machine-readable form (without <em>-p</em>) or in patch form (with <em>-p</em>). This output can be suppressed. It is only useful with <em>-v</em> flag. @@ -849,7 +897,7 @@ </dt> <dd> <p> - This flag causes <tt>git-diff-tree --stdin</tt> to also show + This flag causes <em>git-diff-tree --stdin</em> to also show the commit message before the differences. </p> </dd> @@ -863,8 +911,8 @@ <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. When omitted, the format defaults to <em>medium</em>. </p> -<p>Note: you can specify the default pretty format in the repository -configuration (see <a href="git-config.html">git-config(1)</a>).</p> +<div class="para"><p>Note: you can specify the default pretty format in the repository +configuration (see <a href="git-config.html">git-config(1)</a>).</p></div> </dd> <dt> --abbrev-commit @@ -876,8 +924,8 @@ digits can be specified with "--abbrev=<n>" (which also modifies diff output, if it is displayed). </p> -<p>This should make "--pretty=oneline" a whole lot more readable for -people using 80-column terminals.</p> +<div class="para"><p>This should make "--pretty=oneline" a whole lot more readable for +people using 80-column terminals.</p></div> </dd> <dt> --encoding[=<encoding>] @@ -896,7 +944,7 @@ </dt> <dd> <p> - <tt>git-diff-tree</tt> outputs a line with the commit ID when + <em>git-diff-tree</em> outputs a line with the commit ID when applicable. This flag suppressed the commit ID output. </p> </dd> @@ -939,11 +987,11 @@ if the diff itself is empty. </p> </dd> -</dl> +</dl></div> </div> -<h2>PRETTY FORMATS</h2> +<h2 id="_pretty_formats">PRETTY FORMATS</h2> <div class="sectionbody"> -<p>If the commit is a merge, and if the pretty-format +<div class="para"><p>If the commit is a merge, and if the pretty-format is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is inserted before the <em>Author:</em> line. This line begins with "Merge: " and the sha1s of ancestral commits are printed, @@ -951,9 +999,9 @@ necessarily be the list of the <strong>direct</strong> parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or -file.</p> -<p>Here are some additional details for each format:</p> -<ul> +file.</p></div> +<div class="para"><p>Here are some additional details for each format:</p></div> +<div class="ilist"><ul> <li> <p> <em>oneline</em> @@ -962,7 +1010,7 @@ <div class="content"> <pre><tt><sha1> <title line></tt></pre> </div></div> -<p>This is designed to be as compact as possible.</p> +<div class="para"><p>This is designed to be as compact as possible.</p></div> </li> <li> <p> @@ -986,7 +1034,7 @@ <div class="content"> <pre><tt>commit <sha1> Author: <author> -Date: <date></tt></pre> +Date: <author date></tt></pre> </div></div> <div class="literalblock"> <div class="content"> @@ -1024,9 +1072,9 @@ <div class="content"> <pre><tt>commit <sha1> Author: <author> -AuthorDate: <date & time> +AuthorDate: <author date> Commit: <committer> -CommitDate: <date & time></tt></pre> +CommitDate: <committer date></tt></pre> </div></div> <div class="literalblock"> <div class="content"> @@ -1045,7 +1093,7 @@ <div class="content"> <pre><tt>From <sha1> <date> From: <author> -Date: <date & time> +Date: <author date> Subject: [PATCH] <title line></tt></pre> </div></div> <div class="literalblock"> @@ -1057,31 +1105,31 @@ <p> <em>raw</em> </p> -<p>The <em>raw</em> format shows the entire commit exactly as +<div class="para"><p>The <em>raw</em> format shows the entire commit exactly as stored in the commit object. Notably, the SHA1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the true parent commits, without taking grafts nor history -simplification into account.</p> +simplification into account.</p></div> </li> <li> <p> <em>format:</em> </p> -<p>The <em>format:</em> format allows you to specify which information +<div class="para"><p>The <em>format:</em> format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with <em>%n</em> -instead of <em>\n</em>.</p> -<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em> -would show something like this:</p> +instead of <em>\n</em>.</p></div> +<div class="para"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em> +would show something like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago The title was >>t4119: test autocomputing -p<n> for traditional diff input.<< </tt></pre> </div></div> -<p>The placeholders are:</p> -<ul> +<div class="para"><p>The placeholders are:</p></div> +<div class="ilist"><ul> <li> <p> <em>%H</em>: commit hash @@ -1232,19 +1280,19 @@ <em>%x00</em>: print a byte from a hex code </p> </li> -</ul> +</ul></div> </li> <li> <p> <em>tformat:</em> </p> -<p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it +<div class="para"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it provides "terminator" semantics instead of "separator" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the "oneline" format does. -For example:</p> +For example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log -2 --pretty=format:%h 4da45bef \ @@ -1258,35 +1306,35 @@ 7134973</tt></pre> </div></div> </li> -</ul> +</ul></div> </div> -<h2>Limiting Output</h2> +<h2 id="_limiting_output">Limiting Output</h2> <div class="sectionbody"> -<p>If you're only interested in differences in a subset of files, for -example some architecture-specific files, you might do:</p> +<div class="para"><p>If you're only interested in differences in a subset of files, for +example some architecture-specific files, you might do:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64</tt></pre> </div></div> -<p>and it will only show you what changed in those two directories.</p> -<p>Or if you are searching for what changed in just <tt>kernel/sched.c</tt>, just do</p> +<div class="para"><p>and it will only show you what changed in those two directories.</p></div> +<div class="para"><p>Or if you are searching for what changed in just <tt>kernel/sched.c</tt>, just do</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git diff-tree -r <tree-ish> <tree-ish> kernel/sched.c</tt></pre> </div></div> -<p>and it will ignore all differences to other files.</p> -<p>The pattern is always the prefix, and is matched exactly. There are no +<div class="para"><p>and it will ignore all differences to other files.</p></div> +<div class="para"><p>The pattern is always the prefix, and is matched exactly. There are no wildcards. Even stricter, it has to match a complete path component. I.e. "foo" does not pick up <tt>foobar.h</tt>. "foo" does match <tt>foo/bar.h</tt> -so it can be used to name subdirectories.</p> -<p>An example of normal usage is:</p> +so it can be used to name subdirectories.</p></div> +<div class="para"><p>An example of normal usage is:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>torvalds@ppc970:~/git> git diff-tree 5319e4...... *100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c</tt></pre> </div></div> -<p>which tells you that the last commit changed just one file (it's from -this one:</p> +<div class="para"><p>which tells you that the last commit changed just one file (it's from +this one:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8 @@ -1300,15 +1348,15 @@ Once I do the reference tracking, I'll also make it print out all the HEAD commits it finds, which is even more interesting.</tt></pre> </div></div> -<p>in case you care).</p> +<div class="para"><p>in case you care).</p></div> </div> -<h2>Output format</h2> +<h2 id="_output_format">Output format</h2> <div class="sectionbody"> -<p>The output format from "git-diff-index", "git-diff-tree", -"git-diff-files" and "git diff --raw" are very similar.</p> -<p>These commands all compare two sets of things; what is -compared differs:</p> -<dl> +<div class="para"><p>The output format from "git-diff-index", "git-diff-tree", +"git-diff-files" and "git diff --raw" are very similar.</p></div> +<div class="para"><p>These commands all compare two sets of things; what is +compared differs:</p></div> +<div class="vlist"><dl> <dt> git-diff-index <tree-ish> </dt> @@ -1341,8 +1389,8 @@ compares the index and the files on the filesystem. </p> </dd> -</dl> -<p>An output line is formatted this way:</p> +</dl></div> +<div class="para"><p>An output line is formatted this way:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0 @@ -1352,8 +1400,8 @@ delete :100644 000000 1234567... 0000000... D file5 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre> </div></div> -<p>That is, from the left to the right:</p> -<ol> +<div class="para"><p>That is, from the left to the right:</p></div> +<div class="olist"><ol> <li> <p> a colon. @@ -1429,25 +1477,25 @@ an LF or a NUL when <em>-z</em> option is used, to terminate the record. </p> </li> -</ol> -<p><sha1> is shown as all 0's if a file is new on the filesystem -and it is out of sync with the index.</p> -<p>Example:</p> +</ol></div> +<div class="para"><p><sha1> is shown as all 0's if a file is new on the filesystem +and it is out of sync with the index.</p></div> +<div class="para"><p>Example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre> </div></div> -<p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters +<div class="para"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, -respectively.</p> +respectively.</p></div> </div> -<h2>diff format for merges</h2> +<h2 id="_diff_format_for_merges">diff format for merges</h2> <div class="sectionbody"> -<p>"git-diff-tree", "git-diff-files" and "git-diff --raw" +<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw" can take <em>-c</em> or <em>--cc</em> option to generate diff output also for merge commits. The output differs -from the format described above in the following way:</p> -<ol> +from the format described above in the following way:</p></div> +<div class="olist"><ol> <li> <p> there is a colon for each parent @@ -1473,26 +1521,26 @@ single path, only for "dst" </p> </li> -</ol> -<p>Example:</p> +</ol></div> +<div class="para"><p>Example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre> </div></div> -<p>Note that <em>combined diff</em> lists only files which were modified from -all parents.</p> +<div class="para"><p>Note that <em>combined diff</em> lists only files which were modified from +all parents.</p></div> </div> -<h2>Generating patches with -p</h2> +<h2 id="_generating_patches_with_p">Generating patches with -p</h2> <div class="sectionbody"> -<p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run +<div class="para"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a <em>-p</em> option, "git diff" without the <em>--raw</em> option, or "git log" with the "-p" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the -GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p> -<p>What the -p option produces is slightly different from the traditional -diff format.</p> -<ol> +GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div> +<div class="para"><p>What the -p option produces is slightly different from the traditional +diff format.</p></div> +<div class="olist"><ol> <li> <p> It is preceded with a "git diff" header, that looks like @@ -1502,12 +1550,12 @@ <div class="content"> <pre><tt>diff --git a/file1 b/file2</tt></pre> </div></div> -<p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is +<div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, -<tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p> -<p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the +<tt>/dev/null</tt> is <em>not</em> used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div> +<div class="para"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the name of the source file of the rename/copy and the name of -the file that rename/copy produces, respectively.</p> +the file that rename/copy produces, respectively.</p></div> </li> <li> <p> @@ -1536,20 +1584,20 @@ pathname is put in double quotes. </p> </li> -</ol> -<p>The similarity index is the percentage of unchanged lines, and +</ol></div> +<div class="para"><p>The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old -file made it into the new one.</p> +file made it into the new one.</p></div> </div> -<h2>combined diff format</h2> +<h2 id="_combined_diff_format">combined diff format</h2> <div class="sectionbody"> -<p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or +<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or <em>--cc</em> option to produce <em>combined diff</em>. For showing a merge commit with "git log -p", this is the default format. -A <em>combined diff</em> format looks like this:</p> +A <em>combined diff</em> format looks like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>diff --combined describe.c @@ -1580,7 +1628,7 @@ initialized = 1; for_each_ref(get_name);</tt></pre> </div></div> -<ol> +<div class="olist"><ol> <li> <p> It is preceded with a "git diff" header, that looks like @@ -1590,7 +1638,7 @@ <div class="content"> <pre><tt>diff --combined file</tt></pre> </div></div> -<p>or like this (when <em>--cc</em> option is used):</p> +<div class="para"><p>or like this (when <em>--cc</em> option is used):</p></div> <div class="literalblock"> <div class="content"> <pre><tt>diff --c file</tt></pre> @@ -1608,11 +1656,11 @@ new file mode <mode> deleted file mode <mode>,<mode></tt></pre> </div></div> -<p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of +<div class="para"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two -<tree-ish> and are not used by combined diff format.</p> +<tree-ish> and are not used by combined diff format.</p></div> </li> <li> <p> @@ -1623,9 +1671,9 @@ <pre><tt>--- a/file +++ b/file</tt></pre> </div></div> -<p>Similar to two-line header for traditional <em>unified</em> diff +<div class="para"><p>Similar to two-line header for traditional <em>unified</em> diff format, <tt>/dev/null</tt> is used to signal created or deleted -files.</p> +files.</p></div> </li> <li> <p> @@ -1639,59 +1687,59 @@ <div class="content"> <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre> </div></div> -<p>There are (number of parents + 1) <tt>@</tt> characters in the chunk -header for combined diff format.</p> +<div class="para"><p>There are (number of parents + 1) <tt>@</tt> characters in the chunk +header for combined diff format.</p></div> </li> -</ol> -<p>Unlike the traditional <em>unified</em> diff format, which shows two +</ol></div> +<div class="para"><p>Unlike the traditional <em>unified</em> diff format, which shows two files A and B with a single column that has <tt>-</tt> (minus — appears in A but removed in B), <tt>+</tt> (plus — missing in A but added to B), or <tt>" "</tt> (space — unchanged) prefix, this format compares two or more files file1, file2,… with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is -different from it.</p> -<p>A <tt>-</tt> character in the column N means that the line appears in +different from it.</p></div> +<div class="para"><p>A <tt>-</tt> character in the column N means that the line appears in fileN but it does not appear in the result. A <tt>+</tt> character in the column N means that the line appears in the last file, and fileN does not have that line (in other words, the line was -added, from the point of view of that parent).</p> -<p>In the above example output, the function signature was changed +added, from the point of view of that parent).</p></div> +<div class="para"><p>In the above example output, the function signature was changed from both files (hence two <tt>-</tt> removals from both file1 and -file2, plus <tt>++</tt> to mean one line that was added does not appear +file2, plus <tt><tt>+</tt> to mean one line that was added does not appear in either file1 nor file2). Also two other lines are the same -from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p> -<p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a +from file1 but do not appear in file2 (hence prefixed with <tt> </tt></tt>).</p></div> +<div class="para"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by <tt>git diff-files -c</tt>, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka -"their version").</p> +"their version").</p></div> </div> -<h2>other diff formats</h2> +<h2 id="_other_diff_formats">other diff formats</h2> <div class="sectionbody"> -<p>The <tt>--summary</tt> option describes newly added, deleted, renamed and +<div class="para"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and copied files. The <tt>--stat</tt> option adds diffstat(1) graph to the output. These options can be combined with other options, such as -<tt>-p</tt>, and are meant for human consumption.</p> -<p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output +<tt>-p</tt>, and are meant for human consumption.</p></div> +<div class="para"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output formats the pathnames compactly by combining common prefix and suffix of the pathnames. For example, a change that moves <tt>arch/i386/Makefile</tt> to -<tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p> +<tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>arch/{i386 => x86}/Makefile | 4 +--</tt></pre> </div></div> -<p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed +<div class="para"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed for easier machine consumption. An entry in <tt>--numstat</tt> output looks -like this:</p> +like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>1 2 README 3 1 arch/{i386 => x86}/Makefile</tt></pre> </div></div> -<p>That is, from left to right:</p> -<ol> +<div class="para"><p>That is, from left to right:</p></div> +<div class="olist"><ol> <li> <p> the number of added lines; @@ -1722,15 +1770,15 @@ a newline. </p> </li> -</ol> -<p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p> +</ol></div> +<div class="para"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>1 2 README NUL 3 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</tt></pre> </div></div> -<p>That is:</p> -<ol> +<div class="para"><p>That is:</p></div> +<div class="olist"><ol> <li> <p> the number of added lines; @@ -1776,28 +1824,28 @@ a NUL. </p> </li> -</ol> -<p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow +</ol></div> +<div class="para"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to <tt>NUL</tt> would yield -the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p> +the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:41 UTC +Last updated 2008-07-06 05:16:44 UTC </div> </div> </body> diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 68feb08..0e45b58 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt
@@ -20,7 +20,7 @@ If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below). -Note that `git-diff-tree` can use the tree encapsulated in a commit object. +Note that 'git-diff-tree' can use the tree encapsulated in a commit object. OPTIONS ------- @@ -58,25 +58,25 @@ separated with a single space are given. -m:: - By default, `git-diff-tree --stdin` does not show + By default, 'git-diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also '-c'. -s:: - By default, `git-diff-tree --stdin` shows differences, + By default, 'git-diff-tree --stdin' shows differences, either in machine-readable form (without '-p') or in patch form (with '-p'). This output can be suppressed. It is only useful with '-v' flag. -v:: - This flag causes `git-diff-tree --stdin` to also show + This flag causes 'git-diff-tree --stdin' to also show the commit message before the differences. include::pretty-options.txt[] --no-commit-id:: - `git-diff-tree` outputs a line with the commit ID when + 'git-diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output. -c::
diff --git a/git-fast-export.html b/git-fast-export.html index 003af0a..7174960 100644 --- a/git-fast-export.html +++ b/git-fast-export.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-fast-export(1)</title> </head> @@ -272,26 +320,26 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git fast-export [options]</em> | <em>git fast-import</em></p> +<div class="para"><p><em>git fast-export [options]</em> | <em>git fast-import</em></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This program dumps the given revisions in a form suitable to be piped -into <tt>git-fast-import</tt>.</p> -<p>You can use it as a human readable bundle replacement (see +<div class="para"><p>This program dumps the given revisions in a form suitable to be piped +into <em>git-fast-import</em>.</p></div> +<div class="para"><p>You can use it as a human readable bundle replacement (see <a href="git-bundle.html">git-bundle(1)</a>), or as a kind of an interactive -<tt>git-filter-branch</tt>.</p> +<em>git-filter-branch</em>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --progress=<n> </dt> <dd> <p> Insert <em>progress</em> statements every <n> objects, to be shown by - <tt>git-fast-import</tt> during import. + <em>git-fast-import</em> during import. </p> </dd> <dt> @@ -303,10 +351,10 @@ after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match. </p> -<p>When asking to <em>abort</em> (which is the default), this program will die +<div class="para"><p>When asking to <em>abort</em> (which is the default), this program will die when encountering a signed tag. With <em>strip</em>, the tags will be made unsigned, with <em>verbatim</em>, they will be silently exported -and with <em>warn</em>, they will be exported, but you will see a warning.</p> +and with <em>warn</em>, they will be exported, but you will see a warning.</p></div> </dd> <dt> --export-marks=<file> @@ -332,55 +380,55 @@ <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. </p> -<p>Any commits that have already been marked will not be exported again. +<div class="para"><p>Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the -marks the same across runs.</p> +marks the same across runs.</p></div> </dd> -</dl> +</dl></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> <div class="listingblock"> <div class="content"> <pre><tt>$ git fast-export --all | (cd /empty/repository && git fast-import)</tt></pre> </div></div> -<p>This will export the whole repository and import it into the existing +<div class="para"><p>This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in -UTF-8, it would be a one-to-one mirror.</p> +UTF-8, it would be a one-to-one mirror.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git fast-export master~5..master | sed "s|refs/heads/master|refs/heads/other|" | git fast-import</tt></pre> </div></div> -<p>This makes a new branch called <em>other</em> from <em>master~5..master</em> -(i.e. if <em>master</em> has linear history, it will take the last 5 commits).</p> -<p>Note that this assumes that none of the blobs and commit messages +<div class="para"><p>This makes a new branch called <em>other</em> from <em>master~5..master</em> +(i.e. if <em>master</em> has linear history, it will take the last 5 commits).</p></div> +<div class="para"><p>Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string -<em>refs/heads/master</em>.</p> +<em>refs/heads/master</em>.</p></div> </div> -<h2>Limitations</h2> +<h2 id="_limitations">Limitations</h2> <div class="sectionbody"> -<p>Since <tt>git-fast-import</tt> cannot tag trees, you will not be +<div class="para"><p>Since <em>git-fast-import</em> cannot tag trees, you will not be able to export the linux-2.6.git repository completely, as it contains -a tag referencing a tree instead of a commit.</p> +a tag referencing a tree instead of a commit.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Johannes E. Schindelin <johannes.schindelin@gmx.de>.</p> +<div class="para"><p>Written by Johannes E. Schindelin <johannes.schindelin@gmx.de>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Johannes E. Schindelin <johannes.schindelin@gmx.de>.</p> +<div class="para"><p>Documentation by Johannes E. Schindelin <johannes.schindelin@gmx.de>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:42 UTC +Last updated 2008-07-06 05:16:44 UTC </div> </div> </body> diff --git a/git-fast-export.txt b/git-fast-export.txt index dbc2b19..4956964 100644 --- a/git-fast-export.txt +++ b/git-fast-export.txt
@@ -13,18 +13,18 @@ DESCRIPTION ----------- This program dumps the given revisions in a form suitable to be piped -into `git-fast-import`. +into 'git-fast-import'. You can use it as a human readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive -`git-filter-branch`. +'git-filter-branch'. OPTIONS ------- --progress=<n>:: Insert 'progress' statements every <n> objects, to be shown by - `git-fast-import` during import. + 'git-fast-import' during import. --signed-tags=(verbatim|warn|strip|abort):: Specify how to handle signed tags. Since any transformation @@ -85,7 +85,7 @@ Limitations ----------- -Since `git-fast-import` cannot tag trees, you will not be +Since 'git-fast-import' cannot tag trees, you will not be able to export the linux-2.6.git repository completely, as it contains a tag referencing a tree instead of a commit.
diff --git a/git-fast-import.html b/git-fast-import.html index 3a52e70..5b0932d 100644 --- a/git-fast-import.html +++ b/git-fast-import.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-fast-import(1)</title> </head> @@ -272,28 +320,28 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p>frontend | <em>git fast-import</em> [options]</p> +<div class="para"><p>frontend | <em>git fast-import</em> [options]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This program is usually not what the end user wants to run directly. +<div class="para"><p>This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents -stored there to <tt>git-fast-import</tt>.</p> -<p>fast-import reads a mixed command/data stream from standard input and +stored there to <em>git-fast-import</em>.</p></div> +<div class="para"><p>fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository -with the newly imported data.</p> -<p>The fast-import backend itself can import into an empty repository (one that -has already been initialized by <tt>git-init</tt>) or incrementally +with the newly imported data.</p></div> +<div class="para"><p>The fast-import backend itself can import into an empty repository (one that +has already been initialized by <em>git-init</em>) or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on -the frontend program in use.</p> +the frontend program in use.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --date-format=<fmt> </dt> @@ -383,7 +431,7 @@ This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls - to <tt>git-pack-objects</tt>. + to <em>git-pack-objects</em>. </p> </dd> <dt> @@ -407,91 +455,91 @@ is currently the default, but can be disabled with --quiet. </p> </dd> -</dl> +</dl></div> </div> -<h2>Performance</h2> +<h2 id="_performance">Performance</h2> <div class="sectionbody"> -<p>The design of fast-import allows it to import large projects in a minimum +<div class="para"><p>The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 -hours on quite modest (~$2,000 USD) hardware.</p> -<p>Most bottlenecks appear to be in foreign source data access (the +hours on quite modest (~$2,000 USD) hardware.</p></div> +<div class="para"><p>Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import writes as fast as the disk will take the data). Imports will run faster if the source data is stored on a different drive than the -destination Git repository (due to less IO contention).</p> +destination Git repository (due to less IO contention).</p></div> </div> -<h2>Development Cost</h2> +<h2 id="_development_cost">Development Cost</h2> <div class="sectionbody"> -<p>A typical frontend for fast-import tends to weigh in at approximately 200 +<div class="para"><p>A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away -(use once, and never look back).</p> +(use once, and never look back).</p></div> </div> -<h2>Parallel Operation</h2> +<h2 id="_parallel_operation">Parallel Operation</h2> <div class="sectionbody"> -<p>Like <tt>git-push</tt> or <tt>git-fetch</tt>, imports handled by fast-import are safe to +<div class="para"><p>Like <em>git-push</em> or <em>git-fetch</em>, imports handled by fast-import are safe to run alongside parallel <tt>git repack -a -d</tt> or <tt>git gc</tt> invocations, -or any other Git operation (including <tt>git-prune</tt>, as loose objects -are never used by fast-import).</p> -<p>fast-import does not lock the branch or tag refs it is actively importing. +or any other Git operation (including <em>git-prune</em>, as loose objects +are never used by fast-import).</p></div> +<div class="para"><p>fast-import does not lock the branch or tag refs it is actively importing. After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all -branch refs, and does not stop on the first failure.</p> -<p>Branch updates can be forced with --force, but its recommended that +branch refs, and does not stop on the first failure.</p></div> +<div class="para"><p>Branch updates can be forced with --force, but its recommended that this only be used on an otherwise quiet repository. Using --force -is not necessary for an initial import into an empty repository.</p> +is not necessary for an initial import into an empty repository.</p></div> </div> -<h2>Technical Discussion</h2> +<h2 id="_technical_discussion">Technical Discussion</h2> <div class="sectionbody"> -<p>fast-import tracks a set of branches in memory. Any branch can be created +<div class="para"><p>fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a <tt>commit</tt> command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source -data. It also simplifies the frontend programs considerably.</p> -<p>fast-import does not use or alter the current working directory, or any +data. It also simplifies the frontend programs considerably.</p></div> +<div class="para"><p>fast-import does not use or alter the current working directory, or any file within it. (It does however update the current Git repository, as referenced by <tt>GIT_DIR</tt>.) Therefore an import frontend may use the working directory for its own purposes, such as extracting file revisions from the foreign source. This ignorance of the working directory also allows fast-import to run very quickly, as it does not need to perform any costly file update operations when switching -between branches.</p> +between branches.</p></div> </div> -<h2>Input Format</h2> +<h2 id="_input_format">Input Format</h2> <div class="sectionbody"> -<p>With the exception of raw file data (which Git does not interpret) +<div class="para"><p>With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or -Ruby is being used.</p> -<p>fast-import is very strict about its input. Where we say SP below we mean +Ruby is being used.</p></div> +<div class="para"><p>fast-import is very strict about its input. Where we say SP below we mean <strong>exactly</strong> one space. Likewise LF means one (and only one) linefeed. Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters -unexpected input.</p> -<h3>Stream Comments</h3> -<p>To aid in debugging frontends fast-import ignores any line that +unexpected input.</p></div> +<h3 id="_stream_comments">Stream Comments</h3><div style="clear:left"></div> +<div class="para"><p>To aid in debugging frontends fast-import ignores any line that begins with <tt>#</tt> (ASCII pound/hash) up to and including the line ending <tt>LF</tt>. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the -frontend and useful when inspecting a fast-import data stream.</p> -<h3>Date Formats</h3> -<p>The following date formats are supported. A frontend should select +frontend and useful when inspecting a fast-import data stream.</p></div> +<h3 id="_date_formats">Date Formats</h3><div style="clear:left"></div> +<div class="para"><p>The following date formats are supported. A frontend should select the format it will use for this import by passing the format name -in the --date-format=<fmt> command line option.</p> -<dl> +in the --date-format=<fmt> command line option.</p></div> +<div class="vlist"><dl> <dt> <tt>raw</tt> </dt> @@ -501,21 +549,21 @@ It is also fast-import's default format, if --date-format was not specified. </p> -<p>The time of the event is specified by <tt><time></tt> as the number of +<div class="para"><p>The time of the event is specified by <tt><time></tt> as the number of seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is -written as an ASCII decimal integer.</p> -<p>The local offset is specified by <tt><offutc></tt> as a positive or negative +written as an ASCII decimal integer.</p></div> +<div class="para"><p>The local offset is specified by <tt><offutc></tt> as a positive or negative offset from UTC. For example EST (which is 5 hours behind UTC) would be expressed in <tt><tz></tt> by “-0500” while UTC is “+0000”. The local offset does not affect <tt><time></tt>; it is used only as an -advisement to help formatting routines display the timestamp.</p> -<p>If the local offset is not available in the source material, use +advisement to help formatting routines display the timestamp.</p></div> +<div class="para"><p>If the local offset is not available in the source material, use “+0000”, or the most common local offset. For example many organizations have a CVS repository which has only ever been accessed by users who are located in the same location and timezone. In this -case a reasonable offset from UTC could be assumed.</p> -<p>Unlike the <tt>rfc2822</tt> format, this format is very strict. Any -variation in formatting will cause fast-import to reject the value.</p> +case a reasonable offset from UTC could be assumed.</p></div> +<div class="para"><p>Unlike the <tt>rfc2822</tt> format, this format is very strict. Any +variation in formatting will cause fast-import to reject the value.</p></div> </dd> <dt> <tt>rfc2822</tt> @@ -524,27 +572,27 @@ <p> This is the standard email format as described by RFC 2822. </p> -<p>An example value is “Tue Feb 6 11:22:18 2007 -0500”. The Git +<div class="para"><p>An example value is “Tue Feb 6 11:22:18 2007 -0500”. The Git parser is accurate, but a little on the lenient side. It is the -same parser used by <tt>git-am</tt> when applying patches -received from email.</p> -<p>Some malformed strings may be accepted as valid dates. In some of +same parser used by <em>git-am</em> when applying patches +received from email.</p></div> +<div class="para"><p>Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. -Seriously malformed strings will be rejected.</p> -<p>Unlike the <tt>raw</tt> format above, the timezone/UTC offset information +Seriously malformed strings will be rejected.</p></div> +<div class="para"><p>Unlike the <tt>raw</tt> format above, the timezone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that -this information be as accurate as possible.</p> -<p>If the source material uses RFC 2822 style dates, +this information be as accurate as possible.</p></div> +<div class="para"><p>If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has -been well tested in the wild.</p> -<p>Frontends should prefer the <tt>raw</tt> format if the source material +been well tested in the wild.</p></div> +<div class="para"><p>Frontends should prefer the <tt>raw</tt> format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no -ambiguity in parsing.</p> +ambiguity in parsing.</p></div> </dd> <dt> <tt>now</tt> @@ -554,27 +602,27 @@ Always use the current time and timezone. The literal <tt>now</tt> must always be supplied for <tt><when></tt>. </p> -<p>This is a toy format. The current time and timezone of this system +<div class="para"><p>This is a toy format. The current time and timezone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or -timezone.</p> -<p>This particular format is supplied as its short to implement and +timezone.</p></div> +<div class="para"><p>This particular format is supplied as its short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or -<tt>git-update-index</tt>.</p> -<p>If separate <tt>author</tt> and <tt>committer</tt> commands are used in a <tt>commit</tt> +<em>git-update-index</em>.</p></div> +<div class="para"><p>If separate <tt>author</tt> and <tt>committer</tt> commands are used in a <tt>commit</tt> the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit <tt>author</tt> (thus copying from <tt>committer</tt>) or to use a -date format other than <tt>now</tt>.</p> +date format other than <tt>now</tt>.</p></div> </dd> -</dl> -<h3>Commands</h3> -<p>fast-import accepts several commands to update the current repository +</dl></div> +<h3 id="_commands">Commands</h3><div style="clear:left"></div> +<div class="para"><p>fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion -(with examples) of each command follows later.</p> -<dl> +(with examples) of each command follows later.</p></div> +<div class="vlist"><dl> <dt> <tt>commit</tt> </dt> @@ -637,10 +685,10 @@ to perform an import. </p> </dd> -</dl> -<h3><tt>commit</tt></h3> -<p>Create or update a branch with a new commit, recording one logical -change to the project.</p> +</dl></div> +<h3 id="_tt_commit_tt"><tt>commit</tt></h3><div style="clear:left"></div> +<div class="para"><p>Create or update a branch with a new commit, recording one logical +change to the project.</p></div> <div class="literalblock"> <div class="content"> <pre><tt> 'commit' SP <ref> LF @@ -653,56 +701,56 @@ (filemodify | filedelete | filecopy | filerename | filedeleteall)* LF?</tt></pre> </div></div> -<p>where <tt><ref></tt> is the name of the branch to make the commit on. +<div class="para"><p>where <tt><ref></tt> is the name of the branch to make the commit on. Typically branch names are prefixed with <tt>refs/heads/</tt> in Git, so importing the CVS branch symbol <tt>RELENG-1_0</tt> would use <tt>refs/heads/RELENG-1_0</tt> for the value of <tt><ref></tt>. The value of <tt><ref></tt> must be a valid refname in Git. As <tt>LF</tt> is not valid in -a Git refname, no quoting or escaping syntax is supported here.</p> -<p>A <tt>mark</tt> command may optionally appear, requesting fast-import to save a +a Git refname, no quoting or escaping syntax is supported here.</p></div> +<div class="para"><p>A <tt>mark</tt> command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation -from any imported commit.</p> -<p>The <tt>data</tt> command following <tt>committer</tt> must supply the commit +from any imported commit.</p></div> +<div class="para"><p>The <tt>data</tt> command following <tt>committer</tt> must supply the commit message (see below for <tt>data</tt> command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in -UTF-8, as fast-import does not permit other encodings to be specified.</p> -<p>Zero or more <tt>filemodify</tt>, <tt>filedelete</tt>, <tt>filecopy</tt>, <tt>filerename</tt> +UTF-8, as fast-import does not permit other encodings to be specified.</p></div> +<div class="para"><p>Zero or more <tt>filemodify</tt>, <tt>filedelete</tt>, <tt>filecopy</tt>, <tt>filerename</tt> and <tt>filedeleteall</tt> commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a <tt>filedeleteall</tt> command precede all <tt>filemodify</tt>, <tt>filecopy</tt> and <tt>filerename</tt> commands in the same commit, as <tt>filedeleteall</tt> -wipes the branch clean (see below).</p> -<p>The <tt>LF</tt> after the command is optional (it used to be required).</p> -<h4><tt>author</tt></h4> -<p>An <tt>author</tt> command may optionally appear, if the author information +wipes the branch clean (see below).</p></div> +<div class="para"><p>The <tt>LF</tt> after the command is optional (it used to be required).</p></div> +<h4 id="_tt_author_tt"><tt>author</tt></h4> +<div class="para"><p>An <tt>author</tt> command may optionally appear, if the author information might differ from the committer information. If <tt>author</tt> is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of -the fields in <tt>author</tt>, as they are identical to <tt>committer</tt>.</p> -<h4><tt>committer</tt></h4> -<p>The <tt>committer</tt> command indicates who made this commit, and when -they made it.</p> -<p>Here <tt><name></tt> is the person's display name (for example +the fields in <tt>author</tt>, as they are identical to <tt>committer</tt>.</p></div> +<h4 id="_tt_committer_tt"><tt>committer</tt></h4> +<div class="para"><p>The <tt>committer</tt> command indicates who made this commit, and when +they made it.</p></div> +<div class="para"><p>Here <tt><name></tt> is the person's display name (for example “Com M Itter”) and <tt><email></tt> is the person's email address (“cm@example.com”). <tt>LT</tt> and <tt>GT</tt> are the literal less-than (\x3c) and greater-than (\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that <tt><name></tt> is free-form and may contain any sequence of bytes, except -<tt>LT</tt> and <tt>LF</tt>. It is typically UTF-8 encoded.</p> -<p>The time of the change is specified by <tt><when></tt> using the date format +<tt>LT</tt> and <tt>LF</tt>. It is typically UTF-8 encoded.</p></div> +<div class="para"><p>The time of the change is specified by <tt><when></tt> using the date format that was selected by the --date-format=<fmt> command line option. See “Date Formats” above for the set of supported formats, and -their syntax.</p> -<h4><tt>from</tt></h4> -<p>The <tt>from</tt> command is used to specify the commit to initialize +their syntax.</p></div> +<h4 id="_tt_from_tt"><tt>from</tt></h4> +<div class="para"><p>The <tt>from</tt> command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the -new commit.</p> -<p>Omitting the <tt>from</tt> command in the first commit of a new branch +new commit.</p></div> +<div class="para"><p>Omitting the <tt>from</tt> command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new @@ -710,11 +758,11 @@ the commit with an empty tree. Omitting the <tt>from</tt> command on existing branches is usually desired, as the current commit on that branch is automatically assumed to -be the first ancestor of the new commit.</p> -<p>As <tt>LF</tt> is not valid in a Git refname or SHA-1 expression, no -quoting or escaping syntax is supported within <tt><committish></tt>.</p> -<p>Here <tt><committish></tt> is any of the following:</p> -<ul> +be the first ancestor of the new commit.</p></div> +<div class="para"><p>As <tt>LF</tt> is not valid in a Git refname or SHA-1 expression, no +quoting or escaping syntax is supported within <tt><committish></tt>.</p></div> +<div class="para"><p>Here <tt><committish></tt> is any of the following:</p></div> +<div class="ilist"><ul> <li> <p> The name of an existing branch already in fast-import's internal branch @@ -726,12 +774,12 @@ <p> A mark reference, <tt>:<idnum></tt>, where <tt><idnum></tt> is the mark number. </p> -<p>The reason fast-import uses <tt>:</tt> to denote a mark reference is this character +<div class="para"><p>The reason fast-import uses <tt>:</tt> to denote a mark reference is this character is not legal in a Git branch name. The leading <tt>:</tt> makes it easy to distinguish between the mark 42 (<tt>:42</tt>) and the branch 42 (<tt>42</tt> or <tt>refs/heads/42</tt>), or an abbreviated SHA-1 which happened to -consist only of base-10 digits.</p> -<p>Marks must be declared (via <tt>mark</tt>) before they can be used.</p> +consist only of base-10 digits.</p></div> +<div class="para"><p>Marks must be declared (via <tt>mark</tt>) before they can be used.</p></div> </li> <li> <p> @@ -744,21 +792,21 @@ “SPECIFYING REVISIONS” in <a href="git-rev-parse.html">git-rev-parse(1)</a> for details. </p> </li> -</ul> -<p>The special case of restarting an incremental import from the -current branch value should be written as:</p> +</ul></div> +<div class="para"><p>The special case of restarting an incremental import from the +current branch value should be written as:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> from refs/heads/branch^0</tt></pre> </div></div> -<p>The <tt>^0</tt> suffix is necessary as fast-import does not permit a branch to +<div class="para"><p>The <tt>^0</tt> suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the <tt>from</tt> command is even read from the input. Adding <tt>^0</tt> will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the -existing value of the branch.</p> -<h4><tt>merge</tt></h4> -<p>Includes one additional ancestor commit. If the <tt>from</tt> command is +existing value of the branch.</p></div> +<h4 id="_tt_merge_tt"><tt>merge</tt></h4> +<div class="para"><p>Includes one additional ancestor commit. If the <tt>from</tt> command is omitted when creating a new branch, the first <tt>merge</tt> commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of <tt>merge</tt> commands per @@ -766,14 +814,14 @@ However Git's other tools never create commits with more than 15 additional ancestors (forming a 16-way merge). For this reason it is suggested that frontends do not use more than 15 <tt>merge</tt> -commands per commit; 16, if starting a new, empty branch.</p> -<p>Here <tt><committish></tt> is any of the commit specification expressions -also accepted by <tt>from</tt> (see above).</p> -<h4><tt>filemodify</tt></h4> -<p>Included in a <tt>commit</tt> command to add a new file or change the +commands per commit; 16, if starting a new, empty branch.</p></div> +<div class="para"><p>Here <tt><committish></tt> is any of the commit specification expressions +also accepted by <tt>from</tt> (see above).</p></div> +<h4 id="_tt_filemodify_tt"><tt>filemodify</tt></h4> +<div class="para"><p>Included in a <tt>commit</tt> command to add a new file or change the content of an existing file. This command has two different means -of specifying the content of the file.</p> -<dl> +of specifying the content of the file.</p></div> +<div class="vlist"><dl> <dt> External data format </dt> @@ -786,9 +834,9 @@ <div class="content"> <pre><tt> 'M' SP <mode> SP <dataref> SP <path> LF</tt></pre> </div></div> -<p>Here <tt><dataref></tt> can be either a mark reference (<tt>:<idnum></tt>) +<div class="para"><p>Here <tt><dataref></tt> can be either a mark reference (<tt>:<idnum></tt>) set by a prior <tt>blob</tt> command, or a full 40-byte SHA-1 of an -existing Git blob object.</p> +existing Git blob object.</p></div> </dd> <dt> Inline data format @@ -804,12 +852,12 @@ <pre><tt> 'M' SP <mode> SP 'inline' SP <path> LF data</tt></pre> </div></div> -<p>See below for a detailed description of the <tt>data</tt> command.</p> +<div class="para"><p>See below for a detailed description of the <tt>data</tt> command.</p></div> </dd> -</dl> -<p>In both formats <tt><mode></tt> is the type of file entry, specified -in octal. Git only supports the following modes:</p> -<ul> +</dl></div> +<div class="para"><p>In both formats <tt><mode></tt> is the type of file entry, specified +in octal. Git only supports the following modes:</p></div> +<div class="ilist"><ul> <li> <p> <tt>100644</tt> or <tt>644</tt>: A normal (not-executable) file. The majority @@ -827,16 +875,16 @@ <tt>120000</tt>: A symlink, the content of the file will be the link target. </p> </li> -</ul> -<p>In both formats <tt><path></tt> is the complete path of the file to be added -(if not already existing) or modified (if already existing).</p> -<p>A <tt><path></tt> string must use UNIX-style directory separators (forward +</ul></div> +<div class="para"><p>In both formats <tt><path></tt> is the complete path of the file to be added +(if not already existing) or modified (if already existing).</p></div> +<div class="para"><p>A <tt><path></tt> string must use UNIX-style directory separators (forward slash <tt>/</tt>), may contain any byte other than <tt>LF</tt>, and must not -start with double quote (<tt>"</tt>).</p> -<p>If an <tt>LF</tt> or double quote must be encoded into <tt><path></tt> shell-style -quoting should be used, e.g. <tt>"path/with\n and \" in it"</tt>.</p> -<p>The value of <tt><path></tt> must be in canonical form. That is it must not:</p> -<ul> +start with double quote (<tt>"</tt>).</p></div> +<div class="para"><p>If an <tt>LF</tt> or double quote must be encoded into <tt><path></tt> shell-style +quoting should be used, e.g. <tt>"path/with\n and \" in it"</tt>.</p></div> +<div class="para"><p>The value of <tt><path></tt> must be in canonical form. That is it must not:</p></div> +<div class="ilist"><ul> <li> <p> contain an empty directory component (e.g. <tt>foo//bar</tt> is invalid), @@ -858,102 +906,102 @@ <tt>foo/../bar</tt> are invalid). </p> </li> -</ul> -<p>It is recommended that <tt><path></tt> always be encoded using UTF-8.</p> -<h4><tt>filedelete</tt></h4> -<p>Included in a <tt>commit</tt> command to remove a file or recursively +</ul></div> +<div class="para"><p>It is recommended that <tt><path></tt> always be encoded using UTF-8.</p></div> +<h4 id="_tt_filedelete_tt"><tt>filedelete</tt></h4> +<div class="para"><p>Included in a <tt>commit</tt> command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the -first non-empty directory or the root is reached.</p> +first non-empty directory or the root is reached.</p></div> <div class="literalblock"> <div class="content"> <pre><tt> 'D' SP <path> LF</tt></pre> </div></div> -<p>here <tt><path></tt> is the complete path of the file or subdirectory to +<div class="para"><p>here <tt><path></tt> is the complete path of the file or subdirectory to be removed from the branch. -See <tt>filemodify</tt> above for a detailed description of <tt><path></tt>.</p> -<h4><tt>filecopy</tt></h4> -<p>Recursively copies an existing file or subdirectory to a different +See <tt>filemodify</tt> above for a detailed description of <tt><path></tt>.</p></div> +<h4 id="_tt_filecopy_tt"><tt>filecopy</tt></h4> +<div class="para"><p>Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced -by the content copied from the source.</p> +by the content copied from the source.</p></div> <div class="literalblock"> <div class="content"> <pre><tt> 'C' SP <path> SP <path> LF</tt></pre> </div></div> -<p>here the first <tt><path></tt> is the source location and the second +<div class="para"><p>here the first <tt><path></tt> is the source location and the second <tt><path></tt> is the destination. See <tt>filemodify</tt> above for a detailed description of what <tt><path></tt> may look like. To use a source path -that contains SP the path must be quoted.</p> -<p>A <tt>filecopy</tt> command takes effect immediately. Once the source +that contains SP the path must be quoted.</p></div> +<div class="para"><p>A <tt>filecopy</tt> command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of -the copy.</p> -<h4><tt>filerename</tt></h4> -<p>Renames an existing file or subdirectory to a different location +the copy.</p></div> +<h4 id="_tt_filerename_tt"><tt>filerename</tt></h4> +<div class="para"><p>Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If -the destination exists it will be replaced by the source directory.</p> +the destination exists it will be replaced by the source directory.</p></div> <div class="literalblock"> <div class="content"> <pre><tt> 'R' SP <path> SP <path> LF</tt></pre> </div></div> -<p>here the first <tt><path></tt> is the source location and the second +<div class="para"><p>here the first <tt><path></tt> is the source location and the second <tt><path></tt> is the destination. See <tt>filemodify</tt> above for a detailed description of what <tt><path></tt> may look like. To use a source path -that contains SP the path must be quoted.</p> -<p>A <tt>filerename</tt> command takes effect immediately. Once the source +that contains SP the path must be quoted.</p></div> +<div class="para"><p>A <tt>filerename</tt> command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not -impact the destination of the rename.</p> -<p>Note that a <tt>filerename</tt> is the same as a <tt>filecopy</tt> followed by a +impact the destination of the rename.</p></div> +<div class="para"><p>Note that a <tt>filerename</tt> is the same as a <tt>filecopy</tt> followed by a <tt>filedelete</tt> of the source location. There is a slight performance advantage to using <tt>filerename</tt>, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This <tt>filerename</tt> command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a -<tt>filecopy</tt> followed by a <tt>filedelete</tt>.</p> -<h4><tt>filedeleteall</tt></h4> -<p>Included in a <tt>commit</tt> command to remove all files (and also all +<tt>filecopy</tt> followed by a <tt>filedelete</tt>.</p></div> +<h4 id="_tt_filedeleteall_tt"><tt>filedeleteall</tt></h4> +<div class="para"><p>Included in a <tt>commit</tt> command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend -to subsequently add all interesting files from scratch.</p> +to subsequently add all interesting files from scratch.</p></div> <div class="literalblock"> <div class="content"> <pre><tt> 'deleteall' LF</tt></pre> </div></div> -<p>This command is extremely useful if the frontend does not know +<div class="para"><p>This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper <tt>filedelete</tt> commands to -update the content.</p> -<p>Issuing a <tt>filedeleteall</tt> followed by the needed <tt>filemodify</tt> +update the content.</p></div> +<div class="para"><p>Issuing a <tt>filedeleteall</tt> followed by the needed <tt>filemodify</tt> commands to set the correct content will produce the same results as sending only the needed <tt>filemodify</tt> and <tt>filedelete</tt> commands. The <tt>filedeleteall</tt> approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected -paths for a commit are encouraged to do so.</p> -<h3><tt>mark</tt></h3> -<p>Arranges for fast-import to save a reference to the current object, allowing +paths for a commit are encouraged to do so.</p></div> +<h3 id="_tt_mark_tt"><tt>mark</tt></h3><div style="clear:left"></div> +<div class="para"><p>Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the <tt>mark</tt> command appears within. This can be <tt>commit</tt>, -<tt>tag</tt>, and <tt>blob</tt>, but <tt>commit</tt> is the most common usage.</p> +<tt>tag</tt>, and <tt>blob</tt>, but <tt>commit</tt> is the most common usage.</p></div> <div class="literalblock"> <div class="content"> <pre><tt> 'mark' SP ':' <idnum> LF</tt></pre> </div></div> -<p>where <tt><idnum></tt> is the number assigned by the frontend to this mark. +<div class="para"><p>where <tt><idnum></tt> is the number assigned by the frontend to this mark. The value of <tt><idnum></tt> is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as -a mark. Only values greater than or equal to 1 may be used as marks.</p> -<p>New marks are created automatically. Existing marks can be moved +a mark. Only values greater than or equal to 1 may be used as marks.</p></div> +<div class="para"><p>New marks are created automatically. Existing marks can be moved to another object simply by reusing the same <tt><idnum></tt> in another -<tt>mark</tt> command.</p> -<h3><tt>tag</tt></h3> -<p>Creates an annotated tag referring to a specific commit. To create -lightweight (non-annotated) tags see the <tt>reset</tt> command below.</p> +<tt>mark</tt> command.</p></div> +<h3 id="_tt_tag_tt"><tt>tag</tt></h3><div style="clear:left"></div> +<div class="para"><p>Creates an annotated tag referring to a specific commit. To create +lightweight (non-annotated) tags see the <tt>reset</tt> command below.</p></div> <div class="literalblock"> <div class="content"> <pre><tt> 'tag' SP <name> LF @@ -961,46 +1009,46 @@ 'tagger' SP <name> SP LT <email> GT SP <when> LF data</tt></pre> </div></div> -<p>where <tt><name></tt> is the name of the tag to create.</p> -<p>Tag names are automatically prefixed with <tt>refs/tags/</tt> when stored +<div class="para"><p>where <tt><name></tt> is the name of the tag to create.</p></div> +<div class="para"><p>Tag names are automatically prefixed with <tt>refs/tags/</tt> when stored in Git, so importing the CVS branch symbol <tt>RELENG-1_0-FINAL</tt> would use just <tt>RELENG-1_0-FINAL</tt> for <tt><name></tt>, and fast-import will write the -corresponding ref as <tt>refs/tags/RELENG-1_0-FINAL</tt>.</p> -<p>The value of <tt><name></tt> must be a valid refname in Git and therefore +corresponding ref as <tt>refs/tags/RELENG-1_0-FINAL</tt>.</p></div> +<div class="para"><p>The value of <tt><name></tt> must be a valid refname in Git and therefore may contain forward slashes. As <tt>LF</tt> is not valid in a Git refname, -no quoting or escaping syntax is supported here.</p> -<p>The <tt>from</tt> command is the same as in the <tt>commit</tt> command; see -above for details.</p> -<p>The <tt>tagger</tt> command uses the same format as <tt>committer</tt> within -<tt>commit</tt>; again see above for details.</p> -<p>The <tt>data</tt> command following <tt>tagger</tt> must supply the annotated tag +no quoting or escaping syntax is supported here.</p></div> +<div class="para"><p>The <tt>from</tt> command is the same as in the <tt>commit</tt> command; see +above for details.</p></div> +<div class="para"><p>The <tt>tagger</tt> command uses the same format as <tt>committer</tt> within +<tt>commit</tt>; again see above for details.</p></div> +<div class="para"><p>The <tt>data</tt> command following <tt>tagger</tt> must supply the annotated tag message (see below for <tt>data</tt> command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, -as fast-import does not permit other encodings to be specified.</p> -<p>Signing annotated tags during import from within fast-import is not +as fast-import does not permit other encodings to be specified.</p></div> +<div class="para"><p>Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with <tt>reset</tt>, then create the annotated versions of those tags offline -with the standard <tt>git-tag</tt> process.</p> -<h3><tt>reset</tt></h3> -<p>Creates (or recreates) the named branch, optionally starting from +with the standard <em>git-tag</em> process.</p></div> +<h3 id="_tt_reset_tt"><tt>reset</tt></h3><div style="clear:left"></div> +<div class="para"><p>Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new <tt>from</tt> command for an existing branch, or to create a new -branch from an existing commit without creating a new commit.</p> +branch from an existing commit without creating a new commit.</p></div> <div class="literalblock"> <div class="content"> <pre><tt> 'reset' SP <ref> LF ('from' SP <committish> LF)? LF?</tt></pre> </div></div> -<p>For a detailed description of <tt><ref></tt> and <tt><committish></tt> see above -under <tt>commit</tt> and <tt>from</tt>.</p> -<p>The <tt>LF</tt> after the command is optional (it used to be required).</p> -<p>The <tt>reset</tt> command can also be used to create lightweight -(non-annotated) tags. For example:</p> +<div class="para"><p>For a detailed description of <tt><ref></tt> and <tt><committish></tt> see above +under <tt>commit</tt> and <tt>from</tt>.</p></div> +<div class="para"><p>The <tt>LF</tt> after the command is optional (it used to be required).</p></div> +<div class="para"><p>The <tt>reset</tt> command can also be used to create lightweight +(non-annotated) tags. For example:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> <div class="literalblock"> @@ -1009,35 +1057,35 @@ from :938</tt></pre> </div></div> </div></div> -<p>would create the lightweight tag <tt>refs/tags/938</tt> referring to -whatever commit mark <tt>:938</tt> references.</p> -<h3><tt>blob</tt></h3> -<p>Requests writing one file revision to the packfile. The revision +<div class="para"><p>would create the lightweight tag <tt>refs/tags/938</tt> referring to +whatever commit mark <tt>:938</tt> references.</p></div> +<h3 id="_tt_blob_tt"><tt>blob</tt></h3><div style="clear:left"></div> +<div class="para"><p>Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent <tt>commit</tt> command by referencing the blob through an -assigned mark.</p> +assigned mark.</p></div> <div class="literalblock"> <div class="content"> <pre><tt> 'blob' LF mark? data</tt></pre> </div></div> -<p>The mark command is optional here as some frontends have chosen +<div class="para"><p>The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to <tt>commit</tt>. This is typically more work than its worth -however, as marks are inexpensive to store and easy to use.</p> -<h3><tt>data</tt></h3> -<p>Supplies raw data (for use as blob/file content, commit messages, or +however, as marks are inexpensive to store and easy to use.</p></div> +<h3 id="_tt_data_tt"><tt>data</tt></h3><div style="clear:left"></div> +<div class="para"><p>Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. -The delimited format is intended primarily for testing fast-import.</p> -<p>Comment lines appearing within the <tt><raw></tt> part of <tt>data</tt> commands +The delimited format is intended primarily for testing fast-import.</p></div> +<div class="para"><p>Comment lines appearing within the <tt><raw></tt> part of <tt>data</tt> commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any -file/message content whose lines might start with <tt>#</tt>.</p> -<dl> +file/message content whose lines might start with <tt>#</tt>.</p></div> +<div class="vlist"><dl> <dt> Exact byte count format </dt> @@ -1050,14 +1098,14 @@ <pre><tt> 'data' SP <count> LF <raw> LF?</tt></pre> </div></div> -<p>where <tt><count></tt> is the exact number of bytes appearing within +<div class="para"><p>where <tt><count></tt> is the exact number of bytes appearing within <tt><raw></tt>. The value of <tt><count></tt> is expressed as an ASCII decimal integer. The <tt>LF</tt> on either side of <tt><raw></tt> is not -included in <tt><count></tt> and will not be included in the imported data.</p> -<p>The <tt>LF</tt> after <tt><raw></tt> is optional (it used to be required) but +included in <tt><count></tt> and will not be included in the imported data.</p></div> +<div class="para"><p>The <tt>LF</tt> after <tt><raw></tt> is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 -of the next line, even if <tt><raw></tt> did not end with an <tt>LF</tt>.</p> +of the next line, even if <tt><raw></tt> did not end with an <tt>LF</tt>.</p></div> </dd> <dt> Delimited format @@ -1076,51 +1124,51 @@ <delim> LF LF?</tt></pre> </div></div> -<p>where <tt><delim></tt> is the chosen delimiter string. The string <tt><delim></tt> +<div class="para"><p>where <tt><delim></tt> is the chosen delimiter string. The string <tt><delim></tt> must not appear on a line by itself within <tt><raw></tt>, as otherwise fast-import will think the data ends earlier than it really does. The <tt>LF</tt> immediately trailing <tt><raw></tt> is part of <tt><raw></tt>. This is one of the limitations of the delimited format, it is impossible to supply -a data chunk which does not have an LF as its last byte.</p> -<p>The <tt>LF</tt> after <tt><delim> LF</tt> is optional (it used to be required).</p> +a data chunk which does not have an LF as its last byte.</p></div> +<div class="para"><p>The <tt>LF</tt> after <tt><delim> LF</tt> is optional (it used to be required).</p></div> </dd> -</dl> -<h3><tt>checkpoint</tt></h3> -<p>Forces fast-import to close the current packfile, start a new one, and to -save out all current branch refs, tags and marks.</p> +</dl></div> +<h3 id="_tt_checkpoint_tt"><tt>checkpoint</tt></h3><div style="clear:left"></div> +<div class="para"><p>Forces fast-import to close the current packfile, start a new one, and to +save out all current branch refs, tags and marks.</p></div> <div class="literalblock"> <div class="content"> <pre><tt> 'checkpoint' LF LF?</tt></pre> </div></div> -<p>Note that fast-import automatically switches packfiles when the current +<div class="para"><p>Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update -the branch refs, tags or marks.</p> -<p>As a <tt>checkpoint</tt> can require a significant amount of CPU time and +the branch refs, tags or marks.</p></div> +<div class="para"><p>As a <tt>checkpoint</tt> can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take -several minutes for a single <tt>checkpoint</tt> command to complete.</p> -<p>Frontends may choose to issue checkpoints during extremely large +several minutes for a single <tt>checkpoint</tt> command to complete.</p></div> +<div class="para"><p>Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, -explicit checkpointing may not be necessary.</p> -<p>The <tt>LF</tt> after the command is optional (it used to be required).</p> -<h3><tt>progress</tt></h3> -<p>Causes fast-import to print the entire <tt>progress</tt> line unmodified to +explicit checkpointing may not be necessary.</p></div> +<div class="para"><p>The <tt>LF</tt> after the command is optional (it used to be required).</p></div> +<h3 id="_tt_progress_tt"><tt>progress</tt></h3><div style="clear:left"></div> +<div class="para"><p>Causes fast-import to print the entire <tt>progress</tt> line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact -on the current import, or on any of fast-import's internal state.</p> +on the current import, or on any of fast-import's internal state.</p></div> <div class="literalblock"> <div class="content"> <pre><tt> 'progress' SP <any> LF LF?</tt></pre> </div></div> -<p>The <tt><any></tt> part of the command may contain any sequence of bytes +<div class="para"><p>The <tt><any></tt> part of the command may contain any sequence of bytes that does not contain <tt>LF</tt>. The <tt>LF</tt> after the command is optional. Callers may wish to process the output through a tool such as sed to -remove the leading part of the line, for example:</p> +remove the leading part of the line, for example:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> <div class="literalblock"> @@ -1128,31 +1176,31 @@ <pre><tt>frontend | git fast-import | sed 's/^progress //'</tt></pre> </div></div> </div></div> -<p>Placing a <tt>progress</tt> command immediately after a <tt>checkpoint</tt> will +<div class="para"><p>Placing a <tt>progress</tt> command immediately after a <tt>checkpoint</tt> will inform the reader when the <tt>checkpoint</tt> has been completed and it -can safely access the refs that fast-import updated.</p> +can safely access the refs that fast-import updated.</p></div> </div> -<h2>Crash Reports</h2> +<h2 id="_crash_reports">Crash Reports</h2> <div class="sectionbody"> -<p>If fast-import is supplied invalid input it will terminate with a +<div class="para"><p>If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most -recent commands that lead up to the crash.</p> -<p>All recent commands (including stream comments, file changes and +recent commands that lead up to the crash.</p></div> +<div class="para"><p>All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform -during execution.</p> -<p>After writing a crash report fast-import will close the current +during execution.</p></div> +<div class="para"><p>After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and -must be applied manually if the update is needed.</p> -<p>An example crash:</p> +must be applied manually if the update is needed.</p></div> +<div class="para"><p>An example crash:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> <div class="literalblock"> @@ -1234,189 +1282,189 @@ </div></div> </div></div> </div> -<h2>Tips and Tricks</h2> +<h2 id="_tips_and_tricks">Tips and Tricks</h2> <div class="sectionbody"> -<p>The following tips and tricks have been collected from various -users of fast-import, and are offered here as suggestions.</p> -<h3>Use One Mark Per Commit</h3> -<p>When doing a repository conversion, use a unique mark per commit +<div class="para"><p>The following tips and tricks have been collected from various +users of fast-import, and are offered here as suggestions.</p></div> +<h3 id="_use_one_mark_per_commit">Use One Mark Per Commit</h3><div style="clear:left"></div> +<div class="para"><p>When doing a repository conversion, use a unique mark per commit (<tt>mark :<n></tt>) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git -commit to the corresponding source revision.</p> -<p>Coming from a system such as Perforce or Subversion this should be +commit to the corresponding source revision.</p></div> +<div class="para"><p>Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset -number or the Subversion revision number.</p> -<h3>Freely Skip Around Branches</h3> -<p>Don't bother trying to optimize the frontend to stick to one branch +number or the Subversion revision number.</p></div> +<h3 id="_freely_skip_around_branches">Freely Skip Around Branches</h3><div style="clear:left"></div> +<div class="para"><p>Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend -code considerably.</p> -<p>The branch LRU builtin to fast-import tends to behave very well, and the +code considerably.</p></div> +<div class="para"><p>The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around -between branches has virtually no impact on import performance.</p> -<h3>Handling Renames</h3> -<p>When importing a renamed file or directory, simply delete the old +between branches has virtually no impact on import performance.</p></div> +<h3 id="_handling_renames">Handling Renames</h3><div style="clear:left"></div> +<div class="para"><p>When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly -during a commit.</p> -<h3>Use Tag Fixup Branches</h3> -<p>Some other SCM systems let the user create a tag from multiple +during a commit.</p></div> +<h3 id="_use_tag_fixup_branches">Use Tag Fixup Branches</h3><div style="clear:left"></div> +<div class="para"><p>Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create -tags which are a subset of the files available in the repository.</p> -<p>Importing these tags as-is in Git is impossible without making at +tags which are a subset of the files available in the repository.</p></div> +<div class="para"><p>Importing these tags as-is in Git is impossible without making at least one commit which “fixes up” the files to match the content of the tag. Use fast-import's <tt>reset</tt> command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the -dummy branch.</p> -<p>For example since all normal branches are stored under <tt>refs/heads/</tt> +dummy branch.</p></div> +<div class="para"><p>For example since all normal branches are stored under <tt>refs/heads/</tt> name the tag fixup branch <tt>TAG_FIXUP</tt>. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name <tt>TAG_FIXUP</tt> -is not <tt>refs/heads/TAG_FIXUP</tt>).</p> -<p>When committing fixups, consider using <tt>merge</tt> to connect the +is not <tt>refs/heads/TAG_FIXUP</tt>).</p></div> +<div class="para"><p>When committing fixups, consider using <tt>merge</tt> to connect the commit(s) which are supplying file revisions to the fixup branch. -Doing so will allow tools such as <tt>git-blame</tt> to track +Doing so will allow tools such as <em>git-blame</em> to track through the real commit history and properly annotate the source -files.</p> -<p>After fast-import terminates the frontend will need to do <tt>rm .git/TAG_FIXUP</tt> -to remove the dummy branch.</p> -<h3>Import Now, Repack Later</h3> -<p>As soon as fast-import completes the Git repository is completely valid +files.</p></div> +<div class="para"><p>After fast-import terminates the frontend will need to do <tt>rm .git/TAG_FIXUP</tt> +to remove the dummy branch.</p></div> +<h3 id="_import_now_repack_later">Import Now, Repack Later</h3><div style="clear:left"></div> +<div class="para"><p>As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, -even for considerably large projects (100,000+ commits).</p> -<p>However repacking the repository is necessary to improve data +even for considerably large projects (100,000+ commits).</p></div> +<div class="para"><p>However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. -There is no reason to wait to explore your new Git project!</p> -<p>If you choose to wait for the repack, don't try to run benchmarks +There is no reason to wait to explore your new Git project!</p></div> +<div class="para"><p>If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use -situations.</p> -<h3>Repacking Historical Data</h3> -<p>If you are repacking very old imported data (e.g. older than the +situations.</p></div> +<h3 id="_repacking_historical_data">Repacking Historical Data</h3><div style="clear:left"></div> +<div class="para"><p>If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying ---window=50 (or higher) when you run <tt>git-repack</tt>. +--window=50 (or higher) when you run <em>git-repack</em>. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your -project will benefit from the smaller repository.</p> -<h3>Include Some Progress Messages</h3> -<p>Every once in a while have your frontend emit a <tt>progress</tt> message +project will benefit from the smaller repository.</p></div> +<h3 id="_include_some_progress_messages">Include Some Progress Messages</h3><div style="clear:left"></div> +<div class="para"><p>Every once in a while have your frontend emit a <tt>progress</tt> message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream -has been processed.</p> +has been processed.</p></div> </div> -<h2>Packfile Optimization</h2> +<h2 id="_packfile_optimization">Packfile Optimization</h2> <div class="sectionbody"> -<p>When packing a blob fast-import always attempts to deltify against the last +<div class="para"><p>When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting -packfile will be compressed, but will not be optimal.</p> -<p>Frontends which have efficient access to all revisions of a +packfile will be compressed, but will not be optimal.</p></div> +<div class="para"><p>Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive <tt>blob</tt> commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during -a sequence of <tt>commit</tt> commands.</p> -<p>The packfile(s) created by fast-import do not encourage good disk access +a sequence of <tt>commit</tt> commands.</p></div> +<div class="para"><p>The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, -speeding up revision traversal through better cache locality.</p> -<p>For this reason it is strongly recommended that users repack the +speeding up revision traversal through better cache locality.</p></div> +<div class="para"><p>For this reason it is strongly recommended that users repack the repository with <tt>git repack -a -d</tt> after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the <tt>-f</tt> option to force recomputation of all deltas can significantly reduce the -final packfile size (30-50% smaller can be quite typical).</p> +final packfile size (30-50% smaller can be quite typical).</p></div> </div> -<h2>Memory Utilization</h2> +<h2 id="_memory_utilization">Memory Utilization</h2> <div class="sectionbody"> -<p>There are a number of factors which affect how much memory fast-import +<div class="para"><p>There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any -malloc overheads to 0, due to its use of large block allocations.</p> -<h3>per object</h3> -<p>fast-import maintains an in-memory structure for every object written in +malloc overheads to 0, due to its use of large block allocations.</p></div> +<h3 id="_per_object">per object</h3><div style="clear:left"></div> +<div class="para"><p>fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system -will require approximately 64 MiB of memory.</p> -<p>The object table is actually a hashtable keyed on the object name +will require approximately 64 MiB of memory.</p></div> +<div class="para"><p>The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common -in an import, typically due to branch merges in the source.</p> -<h3>per mark</h3> -<p>Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 +in an import, typically due to branch merges in the source.</p></div> +<h3 id="_per_mark">per mark</h3><div style="clear:left"></div> +<div class="para"><p>Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for -this import.</p> -<h3>per branch</h3> -<p>Branches are classified as active and inactive. The memory usage -of the two classes is significantly different.</p> -<p>Inactive branches are stored in a structure which uses 96 or 120 +this import.</p></div> +<h3 id="_per_branch">per branch</h3><div style="clear:left"></div> +<div class="para"><p>Branches are classified as active and inactive. The memory usage +of the two classes is significantly different.</p></div> +<div class="para"><p>Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB -of memory.</p> -<p>Active branches have the same overhead as inactive branches, but +of memory.</p></div> +<div class="para"><p>Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree <tt>include</tt> has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree <tt>src</tt> has been modified by a commit since the branch -became active, then its contents will be loaded in memory.</p> -<p>As active branches store metadata about the files contained on that +became active, then its contents will be loaded in memory.</p></div> +<div class="para"><p>As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size -(see below).</p> -<p>fast-import automatically moves active branches to inactive status based on +(see below).</p></div> +<div class="para"><p>fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each <tt>commit</tt> command. The maximum number of active branches can be -increased or decreased on the command line with --active-branches=.</p> -<h3>per active tree</h3> -<p>Trees (aka directories) use just 12 bytes of memory on top of the +increased or decreased on the command line with --active-branches=.</p></div> +<h3 id="_per_active_tree">per active tree</h3><div style="clear:left"></div> +<div class="para"><p>Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see “per active file” below). The cost of a tree is virtually 0, as its overhead amortizes out -over the individual file entries.</p> -<h3>per active file entry</h3> -<p>Files (and pointers to subtrees) within active trees require 52 or 64 +over the individual file entries.</p></div> +<h3 id="_per_active_file_entry">per active file entry</h3><div style="clear:left"></div> +<div class="para"><p>Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename “Makefile” to use just 16 bytes (after including the string header -overhead) no matter how many times it occurs within the project.</p> -<p>The active branch LRU, when coupled with the filename string pool +overhead) no matter how many times it occurs within the project.</p></div> +<div class="para"><p>The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited -memory footprint (less than 2.7 MiB per active branch).</p> +memory footprint (less than 2.7 MiB per active branch).</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Shawn O. Pearce <spearce@spearce.org>.</p> +<div class="para"><p>Written by Shawn O. Pearce <spearce@spearce.org>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Shawn O. Pearce <spearce@spearce.org>.</p> +<div class="para"><p>Documentation by Shawn O. Pearce <spearce@spearce.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:43 UTC +Last updated 2008-07-06 05:16:45 UTC </div> </div> </body> diff --git a/git-fast-import.txt b/git-fast-import.txt index 70cc8e8..2d01d0d 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt
@@ -15,7 +15,7 @@ This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents -stored there to `git-fast-import`. +stored there to 'git-fast-import'. fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository. @@ -24,7 +24,7 @@ with the newly imported data. The fast-import backend itself can import into an empty repository (one that -has already been initialized by `git-init`) or incrementally +has already been initialized by 'git-init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use. @@ -82,11 +82,11 @@ This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls - to `git-pack-objects`. + to 'git-pack-objects'. --quiet:: Disable all non-fatal output, making fast-import silent when it - is successful. This option disables the output shown by + is successful. This option disables the output shown by \--stats. --stats:: @@ -124,9 +124,9 @@ Parallel Operation ------------------ -Like `git-push` or `git-fetch`, imports handled by fast-import are safe to +Like 'git-push' or 'git-fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, -or any other Git operation (including `git-prune`, as loose objects +or any other Git operation (including 'git-prune', as loose objects are never used by fast-import). fast-import does not lock the branch or tag refs it is actively importing. @@ -220,7 +220,7 @@ + An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the -same parser used by `git-am` when applying patches +same parser used by 'git-am' when applying patches received from email. + Some malformed strings may be accepted as valid dates. In some of @@ -256,7 +256,7 @@ This particular format is supplied as its short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or -`git-update-index`. +'git-update-index'. + If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled @@ -654,7 +654,7 @@ complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline -with the standard `git-tag` process. +with the standard 'git-tag' process. `reset` ~~~~~~~ @@ -955,7 +955,7 @@ When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. -Doing so will allow tools such as `git-blame` to track +Doing so will allow tools such as 'git-blame' to track through the real commit history and properly annotate the source files. @@ -984,7 +984,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~ If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying -\--window=50 (or higher) when you run `git-repack`. +\--window=50 (or higher) when you run 'git-repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository.
diff --git a/git-fetch-pack.html b/git-fetch-pack.html index eaf2afc..fa2057c 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-fetch-pack(1)</title> </head> @@ -272,24 +320,24 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git fetch-pack</em> [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>…]</p> +<div class="para"><p><em>git fetch-pack</em> [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>…]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Usually you would want to use <tt>git-fetch</tt>, which is a -higher level wrapper of this command, instead.</p> -<p>Invokes <tt>git-upload-pack</tt> on a possibly remote repository +<div class="para"><p>Usually you would want to use <em>git-fetch</em>, which is a +higher level wrapper of this command, instead.</p></div> +<div class="para"><p>Invokes <em>git-upload-pack</em> on a possibly remote repository and asks it to send objects missing from this repository, to update the named heads. The list of commits available locally is found out by scanning local $GIT_DIR/refs/ and sent to -<tt>git-upload-pack</tt> running on the other end.</p> -<p>This command degenerates to download everything to complete the +<em>git-upload-pack</em> running on the other end.</p></div> +<div class="para"><p>This command degenerates to download everything to complete the asked refs from the remote side when the local side does not -have a common ancestor commit.</p> +have a common ancestor commit.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --all </dt> @@ -306,7 +354,7 @@ </dt> <dd> <p> - Pass <em>-q</em> flag to <tt>git-unpack-objects</tt>; this makes the + Pass <em>-q</em> flag to <em>git-unpack-objects</em>; this makes the cloning process less verbose. </p> </dd> @@ -318,7 +366,7 @@ </dt> <dd> <p> - Do not invoke <tt>git-unpack-objects</tt> on received data, but + Do not invoke <em>git-unpack-objects</em> on received data, but create a single packfile out of it instead, and store it in the object database. If provided twice then the pack is locked against repacking. @@ -349,7 +397,7 @@ </dt> <dd> <p> - Use this to specify the path to <tt>git-upload-pack</tt> on the + Use this to specify the path to <em>git-upload-pack</em> on the remote side, if is not found on your $PATH. Installations of sshd ignores the user's environment setup scripts for login shells (e.g. .bash_profile) and @@ -399,7 +447,7 @@ <dd> <p> A remote host that houses the repository. When this - part is specified, <tt>git-upload-pack</tt> is invoked via + part is specified, <em>git-upload-pack</em> is invoked via ssh. </p> </dd> @@ -421,23 +469,23 @@ unspecified, update from all heads the remote side has. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano.</p> +<div class="para"><p>Documentation by Junio C Hamano.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:43 UTC +Last updated 2008-07-06 05:16:46 UTC </div> </div> </body> diff --git a/git-fetch-pack.txt b/git-fetch-pack.txt index a069f8d..47448da 100644 --- a/git-fetch-pack.txt +++ b/git-fetch-pack.txt
@@ -12,14 +12,14 @@ DESCRIPTION ----------- -Usually you would want to use `git-fetch`, which is a +Usually you would want to use 'git-fetch', which is a higher level wrapper of this command, instead. -Invokes `git-upload-pack` on a possibly remote repository +Invokes 'git-upload-pack' on a possibly remote repository and asks it to send objects missing from this repository, to update the named heads. The list of commits available locally is found out by scanning local $GIT_DIR/refs/ and sent to -`git-upload-pack` running on the other end. +'git-upload-pack' running on the other end. This command degenerates to download everything to complete the asked refs from the remote side when the local side does not @@ -33,12 +33,12 @@ -q:: --quiet:: - Pass '-q' flag to `git-unpack-objects`; this makes the + Pass '-q' flag to 'git-unpack-objects'; this makes the cloning process less verbose. -k:: --keep:: - Do not invoke `git-unpack-objects` on received data, but + Do not invoke 'git-unpack-objects' on received data, but create a single packfile out of it instead, and store it in the object database. If provided twice then the pack is locked against repacking. @@ -54,7 +54,7 @@ otherwise determine the tags this option made available. --upload-pack=<git-upload-pack>:: - Use this to specify the path to `git-upload-pack` on the + Use this to specify the path to 'git-upload-pack' on the remote side, if is not found on your $PATH. Installations of sshd ignores the user's environment setup scripts for login shells (e.g. .bash_profile) and @@ -79,7 +79,7 @@ <host>:: A remote host that houses the repository. When this - part is specified, `git-upload-pack` is invoked via + part is specified, 'git-upload-pack' is invoked via ssh. <directory>::
diff --git a/git-fetch.html b/git-fetch.html index 2f4cf69..7f656d1 100644 --- a/git-fetch.html +++ b/git-fetch.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-fetch(1)</title> </head> @@ -272,26 +320,26 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git fetch</em> <options> <repository> <refspec>…</p> +<div class="para"><p><em>git fetch</em> <options> <repository> <refspec>…</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Fetches named heads or tags from another repository, along with -the objects necessary to complete them.</p> -<p>The ref names and their object names of fetched refs are stored +<div class="para"><p>Fetches named heads or tags from another repository, along with +the objects necessary to complete them.</p></div> +<div class="para"><p>The ref names and their object names of fetched refs are stored in <tt>.git/FETCH_HEAD</tt>. This information is left for a later merge -operation done by <tt>git-merge</tt>.</p> -<p>When <refspec> stores the fetched result in tracking branches, +operation done by <em>git-merge</em>.</p></div> +<div class="para"><p>When <refspec> stores the fetched result in tracking branches, the tags that point at these branches are automatically followed. This is done by first fetching from the remote using the given <refspec>s, and if the repository has objects that are pointed by remote tags that it does not yet have, then fetch those missing tags. If the other end has tags that point at -branches you are not interested in, you will not get them.</p> +branches you are not interested in, you will not get them.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -q </dt> @@ -347,7 +395,7 @@ </dt> <dd> <p> - When <tt>git-fetch</tt> is used with <tt><rbranch>:<lbranch></tt> + When <em>git-fetch</em> is used with <tt><rbranch>:<lbranch></tt> refspec, it refuses to update the local branch <tt><lbranch></tt> unless the remote branch <tt><rbranch></tt> it fetches is a descendant of <tt><lbranch></tt>. This option @@ -402,10 +450,10 @@ </dt> <dd> <p> - By default <tt>git-fetch</tt> refuses to update the head which + By default <em>git-fetch</em> refuses to update the head which corresponds to the current branch. This flag disables the - check. This is purely for the internal use for <tt>git-pull</tt> - to communicate with <tt>git-fetch</tt>, and unless you are + check. This is purely for the internal use for <em>git-pull</em> + to communicate with <em>git-fetch</em>, and unless you are implementing your own Porcelain you are not supposed to use it. </p> @@ -437,16 +485,16 @@ <dd> <p> The canonical format of a <refspec> parameter is - <tt>+?<src>:<dst></tt>; that is, an optional plus <tt>+</tt>, followed + <tt><tt>?<src>:<dst></tt>; that is, an optional plus <tt></tt></tt>, followed by the source ref, followed by a colon <tt>:</tt>, followed by the destination ref. </p> -<p>The remote ref that matches <src> +<div class="para"><p>The remote ref that matches <src> is fetched, and if <dst> is not empty string, the local ref that matches it is fast forwarded using <src>. Again, if the optional plus <tt>+</tt> is used, the local ref is updated even if it does not result in a fast forward -update.</p> +update.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -471,7 +519,7 @@ </td> <td class="content">You never do your own development on branches that appear on the right hand side of a <refspec> colon on <tt>Pull:</tt> lines; -they are to be updated by <tt>git-fetch</tt>. If you intend to do +they are to be updated by <em>git-fetch</em>. If you intend to do development derived from a remote branch <tt>B</tt>, have a <tt>Pull:</tt> line to track it (i.e. <tt>Pull: B:remote-B</tt>), and have a separate branch <tt>my-B</tt> to do your development on top of it. The latter @@ -488,13 +536,13 @@ <div class="title">Note</div> </td> <td class="content">There is a difference between listing multiple <refspec> -directly on <tt>git-pull</tt> command line and having multiple +directly on <em>git-pull</em> command line and having multiple <tt>Pull:</tt> <refspec> lines for a <repository> and running -<tt>git-pull</tt> command without any explicit <refspec> parameters. +<em>git-pull</em> command without any explicit <refspec> parameters. <refspec> listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote refs, you would be making -an Octopus. While <tt>git-pull</tt> run without any explicit <refspec> +an Octopus. While <em>git-pull</em> run without any explicit <refspec> parameter takes default <refspec>s from <tt>Pull:</tt> lines, it merges only the first <refspec> found into the current branch, after fetching all the remote refs. This is because making an @@ -503,8 +551,8 @@ is often useful.</td> </tr></table> </div> -<p>Some short-cut notations are also supported.</p> -<ul> +<div class="para"><p>Some short-cut notations are also supported.</p></div> +<div class="ilist"><ul> <li> <p> <tt>tag <tag></tt> means the same as <tt>refs/tags/<tag>:refs/tags/<tag></tt>; @@ -518,17 +566,17 @@ branch without storing the remote branch anywhere locally </p> </li> -</ul> +</ul></div> </dd> -</dl> +</dl></div> </div> -<h2>GIT URLS<a id="URLS"></a></h2> +<h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2> <div class="sectionbody"> -<p>One of the following notations can be used -to name the remote repository:</p> +<div class="para"><p>One of the following notations can be used +to name the remote repository:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> -<ul> +<div class="ilist"><ul> <li> <p> rsync://host.xz/path/to/repo.git/ @@ -574,17 +622,17 @@ ssh://[user@]host.xz/~/path/to/repo.git </p> </li> -</ul> +</ul></div> </div></div> -<p>SSH is the default transport protocol over the network. You can +<div class="para"><p>SSH is the default transport protocol over the network. You can optionally specify which user to log-in as, and an alternate, scp-like syntax is also supported. Both syntaxes support username expansion, as does the native git protocol, but only the former supports port specification. The following -three are identical to the last three above, respectively:</p> +three are identical to the last three above, respectively:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> -<ul> +<div class="ilist"><ul> <li> <p> [user@]host.xz:/path/to/repo.git/ @@ -600,12 +648,12 @@ [user@]host.xz:path/to/repo.git </p> </li> -</ul> +</ul></div> </div></div> -<p>To sync with a local directory, you can use:</p> +<div class="para"><p>To sync with a local directory, you can use:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> -<ul> +<div class="ilist"><ul> <li> <p> /path/to/repo.git/ @@ -616,34 +664,34 @@ file:///path/to/repo.git/ </p> </li> -</ul> +</ul></div> </div></div> -<p>They are mostly equivalent, except when cloning. See -<a href="git-clone.html">git-clone(1)</a> for details.</p> -<p>If there are a large number of similarly-named remote repositories and +<div class="para"><p>They are mostly equivalent, except when cloning. See +<a href="git-clone.html">git-clone(1)</a> for details.</p></div> +<div class="para"><p>If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a -configuration section of the form:</p> +configuration section of the form:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [url "<actual url base>"] insteadOf = <other url base></tt></pre> </div></div> -<p>For example, with this:</p> +<div class="para"><p>For example, with this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [url "git://git.host.xz/"] insteadOf = host.xz:/path/to/ insteadOf = work:</tt></pre> </div></div> -<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be -rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p> +<div class="para"><p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p></div> </div> -<h2>REMOTES<a id="REMOTES"></a></h2> +<h2 id="_remotes_a_id_remotes_a">REMOTES<a id="REMOTES"></a></h2> <div class="sectionbody"> -<p>The name of one of the following can be used instead -of a URL as <tt><repository></tt> argument:</p> -<ul> +<div class="para"><p>The name of one of the following can be used instead +of a URL as <tt><repository></tt> argument:</p></div> +<div class="ilist"><ul> <li> <p> a remote in the git configuration file: <tt>$GIT_DIR/config</tt>, @@ -659,17 +707,17 @@ a file in the <tt>$GIT_DIR/branches</tt> directory. </p> </li> -</ul> -<p>All of these also allow you to omit the refspec from the command line -because they each contain a refspec which git will use by default.</p> -<h3>Named remote in configuration file</h3> -<p>You can choose to provide the name of a remote which you had previously +</ul></div> +<div class="para"><p>All of these also allow you to omit the refspec from the command line +because they each contain a refspec which git will use by default.</p></div> +<h3 id="_named_remote_in_configuration_file">Named remote in configuration file</h3><div style="clear:left"></div> +<div class="para"><p>You can choose to provide the name of a remote which you had previously configured using <a href="git-remote.html">git-remote(1)</a>, <a href="git-config.html">git-config(1)</a> or even by a manual edit to the <tt>$GIT_DIR/config</tt> file. The URL of this remote will be used to access the repository. The refspec of this remote will be used by default when you do not provide a refspec on the command line. The entry in the -config file would appear like this:</p> +config file would appear like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [remote "<name>"] @@ -677,13 +725,13 @@ push = <refspec> fetch = <refspec></tt></pre> </div></div> -<h3>Named file in <tt>$GIT_DIR/remotes</tt></h3> -<p>You can choose to provide the name of a +<h3 id="_named_file_in_tt_git_dir_remotes_tt">Named file in <tt>$GIT_DIR/remotes</tt></h3><div style="clear:left"></div> +<div class="para"><p>You can choose to provide the name of a file in <tt>$GIT_DIR/remotes</tt>. The URL in this file will be used to access the repository. The refspec in this file will be used as default when you do not provide a refspec on the command line. This file should have the -following format:</p> +following format:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> URL: one of the above URL format @@ -691,49 +739,49 @@ Pull: <refspec> </tt></pre> </div></div> -<p><tt>Push:</tt> lines are used by <tt>git-push</tt> and -<tt>Pull:</tt> lines are used by <tt>git-pull</tt> and <tt>git-fetch</tt>. +<div class="para"><p><tt>Push:</tt> lines are used by <em>git-push</em> and +<tt>Pull:</tt> lines are used by <em>git-pull</em> and <em>git-fetch</em>. Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may -be specified for additional branch mappings.</p> -<h3>Named file in <tt>$GIT_DIR/branches</tt></h3> -<p>You can choose to provide the name of a +be specified for additional branch mappings.</p></div> +<h3 id="_named_file_in_tt_git_dir_branches_tt">Named file in <tt>$GIT_DIR/branches</tt></h3><div style="clear:left"></div> +<div class="para"><p>You can choose to provide the name of a file in <tt>$GIT_DIR/branches</tt>. The URL in this file will be used to access the repository. -This file should have the following format:</p> +This file should have the following format:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> <url>#<head></tt></pre> </div></div> -<p><tt><url></tt> is required; <tt>#<head></tt> is optional. +<div class="para"><p><tt><url></tt> is required; <tt>#<head></tt> is optional. When you do not provide a refspec on the command line, git will use the following refspec, where <tt><head></tt> defaults to <tt>master</tt>, and <tt><repository></tt> is the name of this file -you provided in the command line.</p> +you provided in the command line.</p></div> <div class="listingblock"> <div class="content"> <pre><tt> refs/heads/<head>:<repository></tt></pre> </div></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-pull.html">git-pull(1)</a></p> +<div class="para"><p><a href="git-pull.html">git-pull(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and +Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:44 UTC +Last updated 2008-07-06 05:16:46 UTC </div> </div> </body> diff --git a/git-fetch.txt b/git-fetch.txt index b225566..9e048a8 100644 --- a/git-fetch.txt +++ b/git-fetch.txt
@@ -18,7 +18,7 @@ The ref names and their object names of fetched refs are stored in `.git/FETCH_HEAD`. This information is left for a later merge -operation done by `git-merge`. +operation done by 'git-merge'. When <refspec> stores the fetched result in tracking branches, the tags that point at these branches are automatically
diff --git a/git-filter-branch.html b/git-filter-branch.html index 7cb33fa..9e25539 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-filter-branch(1)</title> </head> @@ -280,34 +328,34 @@ [--original <namespace>] [-d <directory>] [-f | --force] [<rev-list options>…]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Lets you rewrite git revision history by rewriting the branches mentioned +<div class="para"><p>Lets you rewrite git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge -information) will be preserved.</p> -<p>The command will only rewrite the _positive_ refs mentioned in the +information) will be preserved.</p></div> +<div class="para"><p>The command will only rewrite the <em>positive</em> refs mentioned in the command line (e.g. if you pass <em>a..b</em>, only <em>b</em> will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some git bugs or such, -therefore such a usage is permitted.</p> -<p><strong>WARNING</strong>! The rewritten history will have different object names for all +therefore such a usage is permitted.</p></div> +<div class="para"><p><strong>WARNING</strong>! The rewritten history will have different object names for all the objects and will not converge with the original branch. You will not be able to easily push and distribute the rewritten branch on top of the original branch. Please do not use this command if you do not know the full implications, and avoid using it anyway, if a simple single commit -would suffice to fix your problem.</p> -<p>Always verify that the rewritten version is correct: The original refs, +would suffice to fix your problem.</p></div> +<div class="para"><p>Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace -<em>refs/original/</em>.</p> -<p>Note that since this operation is very I/O expensive, it might +<em>refs/original/</em>.</p></div> +<div class="para"><p>Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the -<em>-d</em> option, e.g. on tmpfs. Reportedly the speedup is very noticeable.</p> -<h3>Filters</h3> -<p>The filters are applied in the order as listed below. The <command> +<em>-d</em> option, e.g. on tmpfs. Reportedly the speedup is very noticeable.</p></div> +<h3 id="_filters">Filters</h3><div style="clear:left"></div> +<div class="para"><p>The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the <em>eval</em> command (with the notable exception of the commit filter, for technical reasons). Prior to that, the $GIT_COMMIT environment variable will be set to contain @@ -316,16 +364,16 @@ and GIT_COMMITTER_DATE are set according to the current commit. The values of these variables after the filters have run, are used for the new commit. If any evaluation of <command> returns a non-zero exit status, the whole -operation will be aborted.</p> -<p>A <em>map</em> function is available that takes an "original sha1 id" argument +operation will be aborted.</p></div> +<div class="para"><p>A <em>map</em> function is available that takes an "original sha1 id" argument and outputs a "rewritten sha1 id" if the commit has been already rewritten, and "original sha1 id" otherwise; the <em>map</em> function can return several ids on separate lines if your commit filter emitted -multiple commits.</p> +multiple commits.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --env-filter <command> </dt> @@ -392,17 +440,17 @@ <p> This is the filter for performing the commit. If this filter is specified, it will be called instead of the - <tt>git-commit-tree</tt> command, with arguments of the form + <em>git-commit-tree</em> command, with arguments of the form "<TREE_ID> [-p <PARENT_COMMIT_ID>]…" and the log message on stdin. The commit id is expected on stdout. </p> -<p>As a special extension, the commit filter may emit multiple +<div class="para"><p>As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will -have all of them as parents.</p> -<p>You can use the <em>map</em> convenience function in this filter, and other +have all of them as parents.</p></div> +<div class="para"><p>You can use the <em>map</em> convenience function in this filter, and other convenience functions, too. For example, calling <em>skip_commit "$@"</em> will leave out the current commit (but not its changes! If you want -that, use <tt>git-rebase</tt> instead).</p> +that, use <em>git-rebase</em> instead).</p></div> </dd> <dt> --tag-name-filter <command> @@ -415,11 +463,11 @@ The original tag name is passed via standard input, and the new tag name is expected on standard output. </p> -<p>The original tags are not deleted, but can be overwritten; +<div class="para"><p>The original tags are not deleted, but can be overwritten; use "--tag-name-filter cat" to simply update the tags. In this case, be very careful and make sure you have the old tags -backed up in case the conversion has run afoul.</p> -<p>Nearly proper rewriting of tag objects is supported. If the tag has +backed up in case the conversion has run afoul.</p></div> +<div class="para"><p>Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve @@ -428,7 +476,7 @@ it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point -to other tags will be rewritten to point to the underlying commit.</p> +to other tags will be rewritten to point to the underlying commit.</p></div> </dd> <dt> --subdirectory-filter <directory> @@ -470,7 +518,7 @@ </dt> <dd> <p> - <tt>git filter-branch</tt> refuses to start with an existing temporary + <em>git-filter-branch</em> refuses to start with an existing temporary directory or when there are already refs starting with <em>refs/original/</em>, unless forced. </p> @@ -481,53 +529,53 @@ <dd> <p> When options are given after the new branch name, they will - be passed to <tt>git-rev-list</tt>. Only commits in the resulting + be passed to <em>git-rev-list</em>. Only commits in the resulting output will be filtered, although the filtered commits can still reference parents which are outside of that set. </p> </dd> -</dl> +</dl></div> </div> -<h2>Examples</h2> +<h2 id="_examples">Examples</h2> <div class="sectionbody"> -<p>Suppose you want to remove a file (containing confidential information -or copyright violation) from all commits:</p> +<div class="para"><p>Suppose you want to remove a file (containing confidential information +or copyright violation) from all commits:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>git filter-branch --tree-filter 'rm filename' HEAD</tt></pre> </div></div> -<p>However, if the file is absent from the tree of some commit, +<div class="para"><p>However, if the file is absent from the tree of some commit, a simple <tt>rm filename</tt> will fail for that tree and commit. -Thus you may instead want to use <tt>rm -f filename</tt> as the script.</p> -<p>A significantly faster version:</p> +Thus you may instead want to use <tt>rm -f filename</tt> as the script.</p></div> +<div class="para"><p>A significantly faster version:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>git filter-branch --index-filter 'git update-index --remove filename' HEAD</tt></pre> </div></div> -<p>Now, you will get the rewritten history saved in HEAD.</p> -<p>To set a commit (which typically is at the tip of another +<div class="para"><p>Now, you will get the rewritten history saved in HEAD.</p></div> +<div class="para"><p>To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in -order to paste the other history behind the current history:</p> +order to paste the other history behind the current history:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>git filter-branch --parent-filter 'sed "s/^\$/-p <graft-id>/"' HEAD</tt></pre> </div></div> -<p>(if the parent string is empty - which happens when we are dealing with +<div class="para"><p>(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors -happened). If this is not the case, use:</p> +happened). If this is not the case, use:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>git filter-branch --parent-filter \ 'test $GIT_COMMIT = <commit-id> && echo "-p <graft-id>" || cat' HEAD</tt></pre> </div></div> -<p>or even simpler:</p> +<div class="para"><p>or even simpler:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>echo "$commit-id $graft-id" >> .git/info/grafts git filter-branch $graft-id..HEAD</tt></pre> </div></div> -<p>To remove commits authored by "Darl McBribe" from the history:</p> +<div class="para"><p>To remove commits authored by "Darl McBribe" from the history:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>git filter-branch --commit-filter ' @@ -538,7 +586,7 @@ git commit-tree "$@"; fi' HEAD</tt></pre> </div></div> -<p>The function <em>skip_commit</em> is defined as follows:</p> +<div class="para"><p>The function <em>skip_commit</em> is defined as follows:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>skip_commit() @@ -552,47 +600,47 @@ done; }</tt></pre> </div></div> -<p>The shift magic first throws away the tree id and then the -p +<div class="para"><p>The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 -as their parents instead of the merge commit.</p> -<p>You can rewrite the commit log messages using <tt>--msg-filter</tt>. For -example, <tt>git-svn-id</tt> strings in a repository created by <tt>git-svn</tt> can -be removed this way:</p> +as their parents instead of the merge commit.</p></div> +<div class="para"><p>You can rewrite the commit log messages using <tt>--msg-filter</tt>. For +example, <em>git-svn-id</em> strings in a repository created by <em>git-svn</em> can +be removed this way:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>git filter-branch --msg-filter ' sed -e "/^git-svn-id:/d" '</tt></pre> </div></div> -<p>To restrict rewriting to only part of the history, specify a revision +<div class="para"><p>To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will -point to the top-most revision that a <tt>git-rev-list</tt> of this range -will print.</p> -<p><strong>NOTE</strong> the changes introduced by the commits, and which are not reverted +point to the top-most revision that a <em>git-rev-list</em> of this range +will print.</p></div> +<div class="para"><p><strong>NOTE</strong> the changes introduced by the commits, and which are not reverted by subsequent commits, will still be in the rewritten branch. If you want -to throw out _changes_ together with the commits, you should use the -interactive mode of <tt>git-rebase</tt>.</p> -<p>Consider this history:</p> +to throw out <em>changes</em> together with the commits, you should use the +interactive mode of <em>git-rebase</em>.</p></div> +<div class="para"><p>Consider this history:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> D--E--F--G--H / / A--B-----C</tt></pre> </div></div> -<p>To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:</p> +<div class="para"><p>To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>git filter-branch ... C..H</tt></pre> </div></div> -<p>To rewrite commits E,F,G,H, use one of these:</p> +<div class="para"><p>To rewrite commits E,F,G,H, use one of these:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>git filter-branch ... C..H --not D git filter-branch ... D..H --not C</tt></pre> </div></div> -<p>To move the whole tree into a subdirectory, or remove it from there:</p> +<div class="para"><p>To move the whole tree into a subdirectory, or remove it from there:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>git filter-branch --index-filter \ @@ -602,22 +650,22 @@ mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' HEAD</tt></pre> </div></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Petr "Pasky" Baudis <pasky@suse.cz>, -and the git list <git@vger.kernel.org></p> +<div class="para"><p>Written by Petr "Pasky" Baudis <pasky@suse.cz>, +and the git list <git@vger.kernel.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Petr Baudis and the git list.</p> +<div class="para"><p>Documentation by Petr Baudis and the git list.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:45 UTC +Last updated 2008-07-06 05:16:46 UTC </div> </div> </body> diff --git a/git-filter-branch.txt b/git-filter-branch.txt index a9388e0..a3edc00 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt
@@ -108,7 +108,7 @@ --commit-filter <command>:: This is the filter for performing the commit. If this filter is specified, it will be called instead of the - `git-commit-tree` command, with arguments of the form + 'git-commit-tree' command, with arguments of the form "<TREE_ID> [-p <PARENT_COMMIT_ID>]..." and the log message on stdin. The commit id is expected on stdout. + @@ -119,7 +119,7 @@ You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit "$@"' will leave out the current commit (but not its changes! If you want -that, use `git-rebase` instead). +that, use 'git-rebase' instead). --tag-name-filter <command>:: This is the filter for rewriting tag names. When passed, @@ -163,13 +163,13 @@ -f:: --force:: - `git filter-branch` refuses to start with an existing temporary + 'git-filter-branch' refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced. <rev-list-options>:: When options are given after the new branch name, they will - be passed to `git-rev-list`. Only commits in the resulting + be passed to 'git-rev-list'. Only commits in the resulting output will be filtered, although the filtered commits can still reference parents which are outside of that set. @@ -255,7 +255,7 @@ as their parents instead of the merge commit. You can rewrite the commit log messages using `--msg-filter`. For -example, `git-svn-id` strings in a repository created by `git-svn` can +example, 'git-svn-id' strings in a repository created by 'git-svn' can be removed this way: ------------------------------------------------------- @@ -266,13 +266,13 @@ To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will -point to the top-most revision that a `git-rev-list` of this range +point to the top-most revision that a 'git-rev-list' of this range will print. *NOTE* the changes introduced by the commits, and which are not reverted by subsequent commits, will still be in the rewritten branch. If you want to throw out _changes_ together with the commits, you should use the -interactive mode of `git-rebase`. +interactive mode of 'git-rebase'. Consider this history:
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index a9f2703..3e1905a 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-fmt-merge-msg(1)</title> </head> @@ -276,17 +324,17 @@ <div class="content"><em>git fmt-merge-msg</em> [--log | --no-log] <$GIT_DIR/FETCH_HEAD <em>git fmt-merge-msg</em> [--log | --no-log] -F <file></div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Takes the list of merged objects on stdin and produces a suitable +<div class="para"><p>Takes the list of merged objects on stdin and produces a suitable commit message to be used for the merge commit, usually to be -passed as the <em><merge-message></em> argument of <tt>git-merge</tt>.</p> -<p>This script is intended mostly for internal use by scripts -automatically invoking <tt>git-merge</tt>.</p> +passed as the <em><merge-message></em> argument of <em>git-merge</em>.</p></div> +<div class="para"><p>This script is intended mostly for internal use by scripts +automatically invoking <em>git-merge</em>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --log </dt> @@ -330,11 +378,11 @@ stdin. </p> </dd> -</dl> +</dl></div> </div> -<h2>CONFIGURATION</h2> +<h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> merge.log </dt> @@ -353,27 +401,27 @@ the future. </p> </dd> -</dl> +</dl></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-merge.html">git-merge(1)</a></p> +<div class="para"><p><a href="git-merge.html">git-merge(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:46 UTC +Last updated 2008-07-06 05:16:47 UTC </div> </div> </body> diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index ddb89f8..885edf0 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt
@@ -16,10 +16,10 @@ ----------- Takes the list of merged objects on stdin and produces a suitable commit message to be used for the merge commit, usually to be -passed as the '<merge-message>' argument of `git-merge`. +passed as the '<merge-message>' argument of 'git-merge'. This script is intended mostly for internal use by scripts -automatically invoking `git-merge`. +automatically invoking 'git-merge'. OPTIONS -------
diff --git a/git-for-each-ref.html b/git-for-each-ref.html index 4b0a174..1d69869 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-for-each-ref(1)</title> </head> @@ -276,18 +324,18 @@ <div class="content"><em>git for-each-ref</em> [--count=<count>] [--shell|--perl|--python|--tcl] [--sort=<key>]* [--format=<format>] [<pattern>…]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Iterate over all refs that match <tt><pattern></tt> and show them +<div class="para"><p>Iterate over all refs that match <tt><pattern></tt> and show them according to the given <tt><format></tt>, after sorting them according to the given set of <tt><key></tt>. If <tt><max></tt> is given, stop after showing that many refs. The interpolated values in <tt><format></tt> can optionally be quoted as string literals in the specified -host language allowing their direct evaluation in that language.</p> +host language allowing their direct evaluation in that language.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <count> </dt> @@ -358,15 +406,15 @@ a scriptlet that can directly be `eval`ed. </p> </dd> -</dl> +</dl></div> </div> -<h2>FIELD NAMES</h2> +<h2 id="_field_names">FIELD NAMES</h2> <div class="sectionbody"> -<p>Various values from structured fields in referenced objects can +<div class="para"><p>Various values from structured fields in referenced objects can be used to interpolate into the resulting output, or as sort -keys.</p> -<p>For all objects, the following names can be used:</p> -<dl> +keys.</p></div> +<div class="para"><p>For all objects, the following names can be used:</p></div> +<div class="vlist"><dl> <dt> refname </dt> @@ -388,7 +436,7 @@ </dt> <dd> <p> - The size of the object (the same as <tt>git-cat-file -s</tt> reports). + The size of the object (the same as <em>git-cat-file -s</em> reports). </p> </dd> <dt> @@ -399,31 +447,31 @@ The object name (aka SHA-1). </p> </dd> -</dl> -<p>In addition to the above, for commit and tag objects, the header +</dl></div> +<div class="para"><p>In addition to the above, for commit and tag objects, the header field names (<tt>tree</tt>, <tt>parent</tt>, <tt>object</tt>, <tt>type</tt>, and <tt>tag</tt>) can -be used to specify the value in the header field.</p> -<p>Fields that have name-email-date tuple as its value (<tt>author</tt>, +be used to specify the value in the header field.</p></div> +<div class="para"><p>Fields that have name-email-date tuple as its value (<tt>author</tt>, <tt>committer</tt>, and <tt>tagger</tt>) can be suffixed with <tt>name</tt>, <tt>email</tt>, -and <tt>date</tt> to extract the named component.</p> -<p>The first line of the message in a commit and tag object is +and <tt>date</tt> to extract the named component.</p></div> +<div class="para"><p>The first line of the message in a commit and tag object is <tt>subject</tt>, the remaining lines are <tt>body</tt>. The whole message -is <tt>contents</tt>.</p> -<p>For sorting purposes, fields with numeric values sort in numeric +is <tt>contents</tt>.</p></div> +<div class="para"><p>For sorting purposes, fields with numeric values sort in numeric order (<tt>objectsize</tt>, <tt>authordate</tt>, <tt>committerdate</tt>, <tt>taggerdate</tt>). -All other fields are used to sort in their byte-value order.</p> -<p>In any case, a field name that refers to a field inapplicable to +All other fields are used to sort in their byte-value order.</p></div> +<div class="para"><p>In any case, a field name that refers to a field inapplicable to the object referred by the ref does not cause an error. It -returns an empty string instead.</p> -<p>As a special case for the date-type fields, you may specify a format for +returns an empty string instead.</p></div> +<div class="para"><p>As a special case for the date-type fields, you may specify a format for the date by adding one of <tt>:default</tt>, <tt>:relative</tt>, <tt>:short</tt>, <tt>:local</tt>, <tt>:iso8601</tt> or <tt>:rfc2822</tt> to the end of the fieldname; e.g. -<tt>%(taggerdate:relative)</tt>.</p> +<tt>%(taggerdate:relative)</tt>.</p></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<p>An example directly producing formatted text. Show the most recent -3 tagged commits::</p> +<div class="para"><p>An example directly producing formatted text. Show the most recent +3 tagged commits::</p></div> <div class="listingblock"> <div class="content"> <pre><tt>#!/bin/sh @@ -437,8 +485,8 @@ %(*body) ' 'refs/tags'</tt></pre> </div></div> -<p>A simple example showing the use of shell eval on the output, -demonstrating the use of --shell. List the prefixes of all heads::</p> +<div class="para"><p>A simple example showing the use of shell eval on the output, +demonstrating the use of --shell. List the prefixes of all heads::</p></div> <div class="listingblock"> <div class="content"> <pre><tt>#!/bin/sh @@ -450,8 +498,8 @@ echo `dirname $ref` done</tt></pre> </div></div> -<p>A bit more elaborate report on tags, demonstrating that the format -may be an entire script::</p> +<div class="para"><p>A bit more elaborate report on tags, demonstrating that the format +may be an entire script::</p></div> <div class="listingblock"> <div class="content"> <pre><tt>#!/bin/sh @@ -505,7 +553,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:46 UTC +Last updated 2008-07-06 05:16:47 UTC </div> </div> </body> diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt index 29c29f8..727d84e 100644 --- a/git-for-each-ref.txt +++ b/git-for-each-ref.txt
@@ -79,7 +79,7 @@ The type of the object (`blob`, `tree`, `commit`, `tag`). objectsize:: - The size of the object (the same as `git-cat-file -s` reports). + The size of the object (the same as 'git-cat-file -s' reports). objectname:: The object name (aka SHA-1).
diff --git a/git-format-patch.html b/git-format-patch.html index b4131ca..cabd928 100644 --- a/git-format-patch.html +++ b/git-format-patch.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-format-patch(1)</title> </head> @@ -285,14 +333,14 @@ [--cover-letter] [ <since> | <revision range> ]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Prepare each commit with its patch in +<div class="para"><p>Prepare each commit with its patch in one file per commit, formatted to resemble UNIX mailbox format. The output of this command is convenient for e-mail submission or -for use with <tt>git-am</tt>.</p> -<p>There are two ways to specify which commits to operate on.</p> -<ol> +for use with <em>git-am</em>.</p></div> +<div class="para"><p>There are two ways to specify which commits to operate on.</p></div> +<div class="olist"><ol> <li> <p> A single commit, <since>, specifies that the commits leading @@ -307,33 +355,33 @@ commits in the specified range. </p> </li> -</ol> -<p>A single commit, when interpreted as a <revision range> +</ol></div> +<div class="para"><p>A single commit, when interpreted as a <revision range> expression, means "everything that leads to that commit", but if you write <em>git format-patch <commit></em>, the previous rule applies to that command line and you do not get "everything since the beginning of the time". If you want to format everything since project inception to one commit, say "git format-patch --root <commit>" to make it clear that it is the -latter case.</p> -<p>By default, each output file is numbered sequentially from 1, and uses the +latter case.</p></div> +<div class="para"><p>By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as the filename. With the --numbered-files option, the output file names will only be numbers, without the first line of the commit appended. The names of the output files are printed to standard -output, unless the --stdout option is specified.</p> -<p>If -o is specified, output files are created in <dir>. Otherwise -they are created in the current working directory.</p> -<p>If -n is specified, instead of "[PATCH] Subject", the first line -is formatted as "[PATCH n/m] Subject".</p> -<p>If given --thread, <tt>git-format-patch</tt> will generate In-Reply-To and +output, unless the --stdout option is specified.</p></div> +<div class="para"><p>If -o is specified, output files are created in <dir>. Otherwise +they are created in the current working directory.</p></div> +<div class="para"><p>If -n is specified, instead of "[PATCH] Subject", the first line +is formatted as "[PATCH n/m] Subject".</p></div> +<div class="para"><p>If given --thread, <em>git-format-patch</em> will generate In-Reply-To and References headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a Message-Id header to -reference.</p> +reference.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -p </dt> @@ -804,10 +852,10 @@ Do not show any source or destination prefix. </p> </dd> -</dl> -<p>For more detailed explanation on these common options, see also -<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p> -<dl> +</dl></div> +<div class="para"><p>For more detailed explanation on these common options, see also +<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div> +<div class="vlist"><dl> <dt> -<n> </dt> @@ -992,10 +1040,10 @@ filenames, use specified suffix. A common alternative is <tt>--suffix=.txt</tt>. </p> -<p>Note that you would need to include the leading dot <tt>.</tt> if you +<div class="para"><p>Note that you would need to include the leading dot <tt>.</tt> if you want a filename like <tt>0001-description-of-my-change.patch</tt>, and the first letter does not have to be a dot. Leaving it empty would -not add any suffix.</p> +not add any suffix.</p></div> </dd> <dt> --no-binary @@ -1008,13 +1056,13 @@ encoded in the patch. </p> </dd> -</dl> +</dl></div> </div> -<h2>CONFIGURATION</h2> +<h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<p>You can specify extra mail header lines to be added to each message +<div class="para"><p>You can specify extra mail header lines to be added to each message in the repository configuration, new defaults for the subject prefix -and file suffix, and number patches when outputting more than one.</p> +and file suffix, and number patches when outputting more than one.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[format] @@ -1025,17 +1073,17 @@ cc = <email></tt></pre> </div></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<ul> +<div class="ilist"><ul> <li> <p> Extract commits between revisions R1 and R2, and apply them on top of -the current branch using <tt>git-am</tt> to cherry-pick them: +the current branch using <em>git-am</em> to cherry-pick them: </p> <div class="listingblock"> <div class="content"> -<pre><tt>$ git format-patch -k --stdout R1..R2 | git-am -3 -k</tt></pre> +<pre><tt>$ git format-patch -k --stdout R1..R2 | git am -3 -k</tt></pre> </div></div> </li> <li> @@ -1047,7 +1095,7 @@ <div class="content"> <pre><tt>$ git format-patch origin</tt></pre> </div></div> -<p>For each commit a separate file is created in the current directory.</p> +<div class="para"><p>For each commit a separate file is created in the current directory.</p></div> </li> <li> <p> @@ -1056,7 +1104,7 @@ </p> <div class="listingblock"> <div class="content"> -<pre><tt>$ git format-patch \--root origin</tt></pre> +<pre><tt>$ git format-patch --root origin</tt></pre> </div></div> </li> <li> @@ -1067,11 +1115,11 @@ <div class="content"> <pre><tt>$ git format-patch -M -B origin</tt></pre> </div></div> -<p>Additionally, it detects and handles renames and complete rewrites +<div class="para"><p>Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review it. Note that the "patch" program does not understand renaming patches, so -use it only when you know the recipient uses git to apply your patch.</p> +use it only when you know the recipient uses git to apply your patch.</p></div> </li> <li> <p> @@ -1083,27 +1131,27 @@ <pre><tt>$ git format-patch -3</tt></pre> </div></div> </li> -</ul> +</ul></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-am.html">git-am(1)</a>, <a href="git-send-email.html">git-send-email(1)</a></p> +<div class="para"><p><a href="git-am.html">git-am(1)</a>, <a href="git-send-email.html">git-send-email(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:46 UTC +Last updated 2008-07-06 05:16:48 UTC </div> </div> </body> diff --git a/git-format-patch.txt b/git-format-patch.txt index 894b82d..7c2ff3e 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt
@@ -27,7 +27,7 @@ Prepare each commit with its patch in one file per commit, formatted to resemble UNIX mailbox format. The output of this command is convenient for e-mail submission or -for use with `git-am`. +for use with 'git-am'. There are two ways to specify which commits to operate on. @@ -61,7 +61,7 @@ If -n is specified, instead of "[PATCH] Subject", the first line is formatted as "[PATCH n/m] Subject". -If given --thread, `git-format-patch` will generate In-Reply-To and +If given --thread, 'git-format-patch' will generate In-Reply-To and References headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a Message-Id header to reference. @@ -175,10 +175,10 @@ ------------ [format] - headers = "Organization: git-foo\n" - subjectprefix = CHANGE - suffix = .txt - numbered = auto + headers = "Organization: git-foo\n" + subjectprefix = CHANGE + suffix = .txt + numbered = auto cc = <email> ------------ @@ -187,10 +187,10 @@ -------- * Extract commits between revisions R1 and R2, and apply them on top of -the current branch using `git-am` to cherry-pick them: +the current branch using 'git-am' to cherry-pick them: + ------------ -$ git format-patch -k --stdout R1..R2 | git-am -3 -k +$ git format-patch -k --stdout R1..R2 | git am -3 -k ------------ * Extract all commits which are in the current branch but not in the @@ -206,7 +206,7 @@ project: + ------------ -$ git format-patch \--root origin +$ git format-patch --root origin ------------ * The same as the previous one:
diff --git a/git-fsck.html b/git-fsck.html index 95657d0..a0d7c8d 100644 --- a/git-fsck.html +++ b/git-fsck.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-fsck(1)</title> </head> @@ -276,13 +324,13 @@ <div class="content"><em>git fsck</em> [--tags] [--root] [--unreachable] [--cache] [--no-reflogs] [--full] [--strict] [--verbose] [--lost-found] [<object>*]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Verifies the connectivity and validity of the objects in the database.</p> +<div class="para"><p>Verifies the connectivity and validity of the objects in the database.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <object> </dt> @@ -290,9 +338,9 @@ <p> An object to treat as the head of an unreachability trace. </p> -<p>If no objects are given, <tt>git-fsck</tt> defaults to using the +<div class="para"><p>If no objects are given, <em>git-fsck</em> defaults to using the index file, all SHA1 references in .git/refs/*, and all reflogs (unless ---no-reflogs is given) as heads.</p> +--no-reflogs is given) as heads.</p></div> </dd> <dt> --unreachable @@ -385,31 +433,31 @@ its object name. </p> </dd> -</dl> -<p>It tests SHA1 and general object sanity, and it does full tracking of +</dl></div> +<div class="para"><p>It tests SHA1 and general object sanity, and it does full tracking of the resulting reachability and everything else. It prints out any corruption it finds (missing or bad objects), and if you use the <em>--unreachable</em> flag it will also print out objects that exist but -that aren't readable from any of the specified head nodes.</p> -<p>So for example</p> +that aren't readable from any of the specified head nodes.</p></div> +<div class="para"><p>So for example</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git fsck --unreachable HEAD $(cat .git/refs/heads/*)</tt></pre> </div></div> -<p>will do quite a _lot_ of verification on the tree. There are a few +<div class="para"><p>will do quite a <em>lot</em> of verification on the tree. There are a few extra validity tests to be added (make sure that tree objects are -sorted properly etc), but on the whole if <tt>git-fsck</tt> is happy, you -do have a valid tree.</p> -<p>Any corrupt objects you will have to find in backups or other archives -(i.e., you can just remove them and do an <tt>rsync</tt> with some other site in -the hopes that somebody else has the object you have corrupted).</p> -<p>Of course, "valid tree" doesn't mean that it wasn't generated by some +sorted properly etc), but on the whole if <em>git-fsck</em> is happy, you +do have a valid tree.</p></div> +<div class="para"><p>Any corrupt objects you will have to find in backups or other archives +(i.e., you can just remove them and do an <em>rsync</em> with some other site in +the hopes that somebody else has the object you have corrupted).</p></div> +<div class="para"><p>Of course, "valid tree" doesn't mean that it wasn't generated by some evil person, and the end result might be crap. git is a revision -tracking system, not a quality assurance system ;)</p> +tracking system, not a quality assurance system ;)</p></div> </div> -<h2>Extracted Diagnostics</h2> +<h2 id="_extracted_diagnostics">Extracted Diagnostics</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> expect dangling commits - potential heads - due to lack of head information </dt> @@ -477,11 +525,11 @@ This indicates a serious data integrity problem. </p> </dd> -</dl> +</dl></div> </div> -<h2>Environment Variables</h2> +<h2 id="_environment_variables">Environment Variables</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> GIT_OBJECT_DIRECTORY </dt> @@ -506,23 +554,23 @@ used to specify additional object database roots (usually unset) </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:46 UTC +Last updated 2008-07-06 05:16:48 UTC </div> </div> </body> diff --git a/git-fsck.txt b/git-fsck.txt index ef4ceb3..d5a7647 100644 --- a/git-fsck.txt +++ b/git-fsck.txt
@@ -21,7 +21,7 @@ <object>:: An object to treat as the head of an unreachability trace. + -If no objects are given, `git-fsck` defaults to using the +If no objects are given, 'git-fsck' defaults to using the index file, all SHA1 references in .git/refs/*, and all reflogs (unless --no-reflogs is given) as heads. @@ -83,11 +83,11 @@ will do quite a _lot_ of verification on the tree. There are a few extra validity tests to be added (make sure that tree objects are -sorted properly etc), but on the whole if `git-fsck` is happy, you +sorted properly etc), but on the whole if 'git-fsck' is happy, you do have a valid tree. Any corrupt objects you will have to find in backups or other archives -(i.e., you can just remove them and do an `rsync` with some other site in +(i.e., you can just remove them and do an 'rsync' with some other site in the hopes that somebody else has the object you have corrupted). Of course, "valid tree" doesn't mean that it wasn't generated by some
diff --git a/git-gc.html b/git-gc.html index 97eec8e..bc7ff0f 100644 --- a/git-gc.html +++ b/git-gc.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-gc(1)</title> </head> @@ -272,36 +320,36 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git gc</em> [--aggressive] [--auto] [--quiet]</p> +<div class="para"><p><em>git gc</em> [--aggressive] [--auto] [--quiet]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Runs a number of housekeeping tasks within the current repository, +<div class="para"><p>Runs a number of housekeeping tasks within the current repository, such as compressing file revisions (to reduce disk space and increase performance) and removing unreachable objects which may have been -created from prior invocations of <tt>git-add</tt>.</p> -<p>Users are encouraged to run this task on a regular basis within +created from prior invocations of <em>git-add</em>.</p></div> +<div class="para"><p>Users are encouraged to run this task on a regular basis within each repository to maintain good disk space utilization and good -operating performance.</p> -<p>Some git commands may automatically run <tt>git-gc</tt>; see the <tt>--auto</tt> flag +operating performance.</p></div> +<div class="para"><p>Some git commands may automatically run <em>git-gc</em>; see the <tt>--auto</tt> flag below for details. If you know what you're doing and all you want is to -disable this behavior permanently without further considerations, just do:</p> +disable this behavior permanently without further considerations, just do:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git config --global gc.auto 0</tt></pre> </div></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --aggressive </dt> <dd> <p> - Usually <tt>git-gc</tt> runs very quickly while providing good disk + Usually <em>git-gc</em> runs very quickly while providing good disk space utilization and performance. This option will cause - <tt>git-gc</tt> to more aggressively optimize the repository at the expense + <em>git-gc</em> to more aggressively optimize the repository at the expense of taking much more time. The effects of this optimization are persistent, so this option only needs to be used occasionally; every few hundred changesets or so. @@ -312,22 +360,22 @@ </dt> <dd> <p> - With this option, <tt>git-gc</tt> checks whether any housekeeping is + With this option, <em>git-gc</em> checks whether any housekeeping is required; if not, it exits without performing any work. Some git commands run <tt>git gc --auto</tt> after performing operations that could create many loose objects. </p> -<p>Housekeeping is required if there are too many loose objects or +<div class="para"><p>Housekeeping is required if there are too many loose objects or too many packs in the repository. If the number of loose objects exceeds the value of the <tt>gc.auto</tt> configuration variable, then all loose objects are combined into a single pack using -<tt>git-repack -d -l</tt>. Setting the value of <tt>gc.auto</tt> to 0 -disables automatic packing of loose objects.</p> -<p>If the number of packs exceeds the value of <tt>gc.autopacklimit</tt>, +<em>git-repack -d -l</em>. Setting the value of <tt>gc.auto</tt> to 0 +disables automatic packing of loose objects.</p></div> +<div class="para"><p>If the number of packs exceeds the value of <tt>gc.autopacklimit</tt>, then existing packs (except those marked with a <tt>.keep</tt> file) are consolidated into a single pack by using the <tt>-A</tt> option of -<tt>git-repack</tt>. Setting <tt>gc.autopacklimit</tt> to 0 disables -automatic consolidation of packs.</p> +<em>git-repack</em>. Setting <tt>gc.autopacklimit</tt> to 0 disables +automatic consolidation of packs.</p></div> </dd> <dt> --quiet @@ -337,73 +385,73 @@ Suppress all progress reports. </p> </dd> -</dl> +</dl></div> </div> -<h2>Configuration</h2> +<h2 id="_configuration">Configuration</h2> <div class="sectionbody"> -<p>The optional configuration variable <em>gc.reflogExpire</em> can be +<div class="para"><p>The optional configuration variable <em>gc.reflogExpire</em> can be set to indicate how long historical entries within each branch's reflog should remain available in this repository. The setting is expressed as a length of time, for example <em>90 days</em> or <em>3 months</em>. -It defaults to <em>90 days</em>.</p> -<p>The optional configuration variable <em>gc.reflogExpireUnreachable</em> +It defaults to <em>90 days</em>.</p></div> +<div class="para"><p>The optional configuration variable <em>gc.reflogExpireUnreachable</em> can be set to indicate how long historical reflog entries which are not part of the current branch should remain available in this repository. These types of entries are generally created as a result of using <tt>git commit --amend</tt> or <tt>git rebase</tt> and are the commits prior to the amend or rebase occurring. Since these changes are not part of the current project most users will want to expire -them sooner. This option defaults to <em>30 days</em>.</p> -<p>The optional configuration variable <em>gc.rerereresolved</em> indicates +them sooner. This option defaults to <em>30 days</em>.</p></div> +<div class="para"><p>The optional configuration variable <em>gc.rerereresolved</em> indicates how long records of conflicted merge you resolved earlier are -kept. This defaults to 60 days.</p> -<p>The optional configuration variable <em>gc.rerereunresolved</em> indicates +kept. This defaults to 60 days.</p></div> +<div class="para"><p>The optional configuration variable <em>gc.rerereunresolved</em> indicates how long records of conflicted merge you have not resolved are -kept. This defaults to 15 days.</p> -<p>The optional configuration variable <em>gc.packrefs</em> determines if -<tt>git-gc</tt> runs <tt>git-pack-refs</tt>. This can be set to "nobare" to enable +kept. This defaults to 15 days.</p></div> +<div class="para"><p>The optional configuration variable <em>gc.packrefs</em> determines if +<em>git-gc</em> runs <em>git-pack-refs</em>. This can be set to "nobare" to enable it within all non-bare repos or it can be set to a boolean value. -This defaults to true.</p> -<p>The optional configuration variable <em>gc.aggressiveWindow</em> controls how +This defaults to true.</p></div> +<div class="para"><p>The optional configuration variable <em>gc.aggressiveWindow</em> controls how much time is spent optimizing the delta compression of the objects in the repository when the --aggressive option is specified. The larger the value, the more time is spent optimizing the delta compression. See the documentation for the --window' option in <a href="git-repack.html">git-repack(1)</a> for -more details. This defaults to 10.</p> -<p>The optional configuration variable <em>gc.pruneExpire</em> controls how old +more details. This defaults to 10.</p></div> +<div class="para"><p>The optional configuration variable <em>gc.pruneExpire</em> controls how old the unreferenced loose objects have to be before they are pruned. The -default is "2 weeks ago".</p> +default is "2 weeks ago".</p></div> </div> -<h2>Notes</h2> +<h2 id="_notes">Notes</h2> <div class="sectionbody"> -<p><tt>git-gc</tt> tries very hard to be safe about the garbage it collects. In +<div class="para"><p><em>git-gc</em> tries very hard to be safe about the garbage it collects. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote -tracking branches, refs saved by <tt>git-filter-branch</tt> in +tracking branches, refs saved by <em>git-filter-branch</em> in refs/original/, or reflogs (which may references commits in branches -that were later amended or rewound).</p> -<p>If you are expecting some objects to be collected and they aren't, check +that were later amended or rewound).</p></div> +<div class="para"><p>If you are expecting some objects to be collected and they aren't, check all of those locations and decide whether it makes sense in your case to -remove those references.</p> +remove those references.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-prune.html">git-prune(1)</a> +<div class="para"><p><a href="git-prune.html">git-prune(1)</a> <a href="git-reflog.html">git-reflog(1)</a> <a href="git-repack.html">git-repack(1)</a> -<a href="git-rerere.html">git-rerere(1)</a></p> +<a href="git-rerere.html">git-rerere(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Shawn O. Pearce <spearce@spearce.org></p> +<div class="para"><p>Written by Shawn O. Pearce <spearce@spearce.org></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:47 UTC +Last updated 2008-07-06 05:16:49 UTC </div> </div> </body> diff --git a/git-gc.txt b/git-gc.txt index 0cce389..7086eea 100644 --- a/git-gc.txt +++ b/git-gc.txt
@@ -15,13 +15,13 @@ Runs a number of housekeeping tasks within the current repository, such as compressing file revisions (to reduce disk space and increase performance) and removing unreachable objects which may have been -created from prior invocations of `git-add`. +created from prior invocations of 'git-add'. Users are encouraged to run this task on a regular basis within each repository to maintain good disk space utilization and good operating performance. -Some git commands may automatically run `git-gc`; see the `--auto` flag +Some git commands may automatically run 'git-gc'; see the `--auto` flag below for details. If you know what you're doing and all you want is to disable this behavior permanently without further considerations, just do: @@ -33,15 +33,15 @@ ------- --aggressive:: - Usually `git-gc` runs very quickly while providing good disk + Usually 'git-gc' runs very quickly while providing good disk space utilization and performance. This option will cause - `git-gc` to more aggressively optimize the repository at the expense + 'git-gc' to more aggressively optimize the repository at the expense of taking much more time. The effects of this optimization are persistent, so this option only needs to be used occasionally; every few hundred changesets or so. --auto:: - With this option, `git-gc` checks whether any housekeeping is + With this option, 'git-gc' checks whether any housekeeping is required; if not, it exits without performing any work. Some git commands run `git gc --auto` after performing operations that could create many loose objects. @@ -50,13 +50,13 @@ too many packs in the repository. If the number of loose objects exceeds the value of the `gc.auto` configuration variable, then all loose objects are combined into a single pack using -`git-repack -d -l`. Setting the value of `gc.auto` to 0 +'git-repack -d -l'. Setting the value of `gc.auto` to 0 disables automatic packing of loose objects. + If the number of packs exceeds the value of `gc.autopacklimit`, then existing packs (except those marked with a `.keep` file) are consolidated into a single pack by using the `-A` option of -`git-repack`. Setting `gc.autopacklimit` to 0 disables +'git-repack'. Setting `gc.autopacklimit` to 0 disables automatic consolidation of packs. --quiet:: @@ -89,7 +89,7 @@ kept. This defaults to 15 days. The optional configuration variable 'gc.packrefs' determines if -`git-gc` runs `git-pack-refs`. This can be set to "nobare" to enable +'git-gc' runs 'git-pack-refs'. This can be set to "nobare" to enable it within all non-bare repos or it can be set to a boolean value. This defaults to true. @@ -108,10 +108,10 @@ Notes ----- -`git-gc` tries very hard to be safe about the garbage it collects. In +'git-gc' tries very hard to be safe about the garbage it collects. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote -tracking branches, refs saved by `git-filter-branch` in +tracking branches, refs saved by 'git-filter-branch' in refs/original/, or reflogs (which may references commits in branches that were later amended or rewound).
diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index 50a9eca..0f31272 100644 --- a/git-get-tar-commit-id.html +++ b/git-get-tar-commit-id.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-get-tar-commit-id(1)</title> </head> @@ -272,33 +320,33 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git get-tar-commit-id</em> < <tarfile></p> +<div class="para"><p><em>git get-tar-commit-id</em> < <tarfile></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Acts as a filter, extracting the commit ID stored in archives created by -<tt>git-archive</tt>. It reads only the first 1024 bytes of input, thus its -runtime is not influenced by the size of <tarfile> very much.</p> -<p>If no commit ID is found, <tt>git-get-tar-commit-id</tt> quietly exists with a +<div class="para"><p>Acts as a filter, extracting the commit ID stored in archives created by +<em>git-archive</em>. It reads only the first 1024 bytes of input, thus its +runtime is not influenced by the size of <tarfile> very much.</p></div> +<div class="para"><p>If no commit ID is found, <em>git-get-tar-commit-id</em> quietly exists with a return code of 1. This can happen if <tarfile> had not been created -using <tt>git-archive</tt> or if the first parameter of <tt>git-archive</tt> had been -a tree ID instead of a commit ID or tag.</p> +using <em>git-archive</em> or if the first parameter of <em>git-archive</em> had been +a tree ID instead of a commit ID or tag.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Rene Scharfe <rene.scharfe@lsrfire.ath.cx></p> +<div class="para"><p>Written by Rene Scharfe <rene.scharfe@lsrfire.ath.cx></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:47 UTC +Last updated 2008-07-06 05:16:49 UTC </div> </div> </body> diff --git a/git-get-tar-commit-id.txt b/git-get-tar-commit-id.txt index 50dfdfa..84f23ee 100644 --- a/git-get-tar-commit-id.txt +++ b/git-get-tar-commit-id.txt
@@ -14,12 +14,12 @@ DESCRIPTION ----------- Acts as a filter, extracting the commit ID stored in archives created by -`git-archive`. It reads only the first 1024 bytes of input, thus its +'git-archive'. It reads only the first 1024 bytes of input, thus its runtime is not influenced by the size of <tarfile> very much. -If no commit ID is found, `git-get-tar-commit-id` quietly exists with a +If no commit ID is found, 'git-get-tar-commit-id' quietly exists with a return code of 1. This can happen if <tarfile> had not been created -using `git-archive` or if the first parameter of `git-archive` had been +using 'git-archive' or if the first parameter of 'git-archive' had been a tree ID instead of a commit ID or tag.
diff --git a/git-grep.html b/git-grep.html index 7d3d200..0fc0117 100644 --- a/git-grep.html +++ b/git-grep.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-grep(1)</title> </head> @@ -285,14 +333,14 @@ [--and|--or|--not|(|)|-e <pattern>…] [<tree>…] [--] [<path>…]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Look for specified patterns in the working tree files, blobs -registered in the index file, or given tree objects.</p> +<div class="para"><p>Look for specified patterns in the working tree files, blobs +registered in the index file, or given tree objects.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --cached </dt> @@ -440,7 +488,7 @@ <p> Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. - For better compatibility with <tt>git-diff</tt>, --name-only is a + For better compatibility with <em>git-diff</em>, --name-only is a synonym for --files-with-matches. </p> </dd> @@ -541,11 +589,11 @@ are <path> limiters. </p> </dd> -</dl> +</dl></div> </div> -<h2>Example</h2> +<h2 id="_example">Example</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> git grep -e '#define' --and \( -e MAX_PATH -e PATH_MAX \) </dt> @@ -564,24 +612,24 @@ files that have lines that match both. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Originally written by Linus Torvalds <torvalds@osdl.org>, later -revamped by Junio C Hamano.</p> +<div class="para"><p>Originally written by Linus Torvalds <torvalds@osdl.org>, later +revamped by Junio C Hamano.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:47 UTC +Last updated 2008-07-06 05:16:49 UTC </div> </div> </body> diff --git a/git-grep.txt b/git-grep.txt index 25cb649..fa4d133 100644 --- a/git-grep.txt +++ b/git-grep.txt
@@ -91,7 +91,7 @@ --files-without-match:: Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. - For better compatibility with `git-diff`, --name-only is a + For better compatibility with 'git-diff', --name-only is a synonym for --files-with-matches. -c::
diff --git a/git-gui.html b/git-gui.html index b7667a0..b8cccbf 100644 --- a/git-gui.html +++ b/git-gui.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-gui(1)</title> </head> @@ -272,26 +320,26 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git gui</em> [<command>] [arguments]</p> +<div class="para"><p><em>git gui</em> [<command>] [arguments]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>A Tcl/Tk based graphical user interface to Git. <tt>git-gui</tt> focuses +<div class="para"><p>A Tcl/Tk based graphical user interface to Git. <em>git-gui</em> focuses on allowing users to make changes to their repository by making new commits, amending existing ones, creating branches, performing -local merges, and fetching/pushing to remote repositories.</p> -<p>Unlike <tt>gitk</tt>, <tt>git-gui</tt> focuses on commit generation +local merges, and fetching/pushing to remote repositories.</p></div> +<div class="para"><p>Unlike <em>gitk</em>, <em>git-gui</em> focuses on commit generation and single file annotation and does not show project history. -It does however supply menu actions to start a <tt>gitk</tt> session from -within <tt>git-gui</tt>.</p> -<p><tt>git-gui</tt> is known to work on all popular UNIX systems, Mac OS X, +It does however supply menu actions to start a <em>gitk</em> session from +within <em>git-gui</em>.</p></div> +<div class="para"><p><em>git-gui</em> is known to work on all popular UNIX systems, Mac OS X, and Windows (under both Cygwin and MSYS). To the extent possible -OS specific user interface guidelines are followed, making <tt>git-gui</tt> -a fairly native interface for users.</p> +OS specific user interface guidelines are followed, making <em>git-gui</em> +a fairly native interface for users.</p></div> </div> -<h2>COMMANDS</h2> +<h2 id="_commands">COMMANDS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> blame </dt> @@ -316,7 +364,7 @@ </dt> <dd> <p> - Start <tt>git-gui</tt> and arrange to make exactly one commit before + Start <em>git-gui</em> and arrange to make exactly one commit before exiting and returning to the shell. The interface is limited to only commit actions, slightly reducing the application's startup time and simplifying the menubar. @@ -327,14 +375,14 @@ </dt> <dd> <p> - Display the currently running version of <tt>git-gui</tt>. + Display the currently running version of <em>git-gui</em>. </p> </dd> -</dl> +</dl></div> </div> -<h2>Examples</h2> +<h2 id="_examples">Examples</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> git gui blame Makefile </dt> @@ -372,7 +420,7 @@ </dt> <dd> <p> - Same as <em>git gui citool</em> (above). + Same as <tt>git gui citool</tt> (above). </p> </dd> <dt> @@ -385,11 +433,11 @@ blame viewer. </p> </dd> -</dl> +</dl></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <a href="gitk.html">gitk(1)</a> </dt> @@ -397,43 +445,43 @@ <p> The git repository browser. Shows branches, commit history and file differences. gitk is the utility started by - <tt>git-gui</tt>'s Repository Visualize actions. + <em>git-gui</em>'s Repository Visualize actions. </p> </dd> -</dl> +</dl></div> </div> -<h2>Other</h2> +<h2 id="_other">Other</h2> <div class="sectionbody"> -<p><tt>git-gui</tt> is actually maintained as an independent project, but stable +<div class="para"><p><em>git-gui</em> is actually maintained as an independent project, but stable versions are distributed as part of the Git suite for the convenience -of end users.</p> -<p>A <tt>git-gui</tt> development repository can be obtained from:</p> +of end users.</p></div> +<div class="para"><p>A <em>git-gui</em> development repository can be obtained from:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git clone git://repo.or.cz/git-gui.git</tt></pre> </div></div> -<p>or</p> +<div class="para"><p>or</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git clone http://repo.or.cz/r/git-gui.git</tt></pre> </div></div> -<p>or browsed online at <a href="http://repo.or.cz/w/git-gui.git/">http://repo.or.cz/w/git-gui.git/</a>.</p> +<div class="para"><p>or browsed online at <a href="http://repo.or.cz/w/git-gui.git/">http://repo.or.cz/w/git-gui.git/</a>.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Shawn O. Pearce <spearce@spearce.org>.</p> +<div class="para"><p>Written by Shawn O. Pearce <spearce@spearce.org>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Shawn O. Pearce <spearce@spearce.org>.</p> +<div class="para"><p>Documentation by Shawn O. Pearce <spearce@spearce.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:47 UTC +Last updated 2008-07-06 05:16:49 UTC </div> </div> </body> diff --git a/git-gui.txt b/git-gui.txt index 940e43f..0e650f4 100644 --- a/git-gui.txt +++ b/git-gui.txt
@@ -11,19 +11,19 @@ DESCRIPTION ----------- -A Tcl/Tk based graphical user interface to Git. `git-gui` focuses +A Tcl/Tk based graphical user interface to Git. 'git-gui' focuses on allowing users to make changes to their repository by making new commits, amending existing ones, creating branches, performing local merges, and fetching/pushing to remote repositories. -Unlike `gitk`, `git-gui` focuses on commit generation +Unlike 'gitk', 'git-gui' focuses on commit generation and single file annotation and does not show project history. -It does however supply menu actions to start a `gitk` session from -within `git-gui`. +It does however supply menu actions to start a 'gitk' session from +within 'git-gui'. -`git-gui` is known to work on all popular UNIX systems, Mac OS X, +'git-gui' is known to work on all popular UNIX systems, Mac OS X, and Windows (under both Cygwin and MSYS). To the extent possible -OS specific user interface guidelines are followed, making `git-gui` +OS specific user interface guidelines are followed, making 'git-gui' a fairly native interface for users. COMMANDS @@ -34,17 +34,17 @@ browser:: Start a tree browser showing all files in the specified - commit (or 'HEAD' by default). Files selected through the + commit (or 'HEAD' by default). Files selected through the browser are opened in the blame viewer. citool:: - Start `git-gui` and arrange to make exactly one commit before + Start 'git-gui' and arrange to make exactly one commit before exiting and returning to the shell. The interface is limited to only commit actions, slightly reducing the application's startup time and simplifying the menubar. version:: - Display the currently running version of `git-gui`. + Display the currently running version of 'git-gui'. Examples @@ -61,7 +61,7 @@ git gui blame v0.99.8 Makefile:: Show the contents of 'Makefile' in revision 'v0.99.8' - and provide annotations for each line. Unlike the above + and provide annotations for each line. Unlike the above example the file is read from the object database and not the working directory. @@ -71,7 +71,7 @@ git citool:: - Same as 'git gui citool' (above). + Same as `git gui citool` (above). git gui browser maint:: @@ -84,15 +84,15 @@ linkgit:gitk[1]:: The git repository browser. Shows branches, commit history and file differences. gitk is the utility started by - `git-gui`'s Repository Visualize actions. + 'git-gui''s Repository Visualize actions. Other ----- -`git-gui` is actually maintained as an independent project, but stable +'git-gui' is actually maintained as an independent project, but stable versions are distributed as part of the Git suite for the convenience of end users. -A `git-gui` development repository can be obtained from: +A 'git-gui' development repository can be obtained from: git clone git://repo.or.cz/git-gui.git
diff --git a/git-hash-object.html b/git-hash-object.html index 38273ae..ea0909e 100644 --- a/git-hash-object.html +++ b/git-hash-object.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-hash-object(1)</title> </head> @@ -272,21 +320,21 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git hash-object</em> [-t <type>] [-w] [--stdin | --stdin-paths] [--] <file>…</p> +<div class="para"><p><em>git hash-object</em> [-t <type>] [-w] [--stdin | --stdin-paths] [--] <file>…</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Computes the object ID value for an object with specified type +<div class="para"><p>Computes the object ID value for an object with specified type with the contents of the named file (which can be outside of the work tree), and optionally writes the resulting object into the object database. Reports its object ID to its standard output. -This is used by <tt>git-cvsimport</tt> to update the index +This is used by <em>git-cvsimport</em> to update the index without modifying files in the work tree. When <type> is not -specified, it defaults to "blob".</p> +specified, it defaults to "blob".</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -t <type> </dt> @@ -319,23 +367,23 @@ Read file names from stdin instead of from the command-line. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:48 UTC +Last updated 2008-07-06 05:16:50 UTC </div> </div> </body> diff --git a/git-hash-object.txt b/git-hash-object.txt index 05550c5..9e654fc 100644 --- a/git-hash-object.txt +++ b/git-hash-object.txt
@@ -16,7 +16,7 @@ with the contents of the named file (which can be outside of the work tree), and optionally writes the resulting object into the object database. Reports its object ID to its standard output. -This is used by `git-cvsimport` to update the index +This is used by 'git-cvsimport' to update the index without modifying files in the work tree. When <type> is not specified, it defaults to "blob".
diff --git a/git-help.html b/git-help.html index a0ca75e..953e0a1 100644 --- a/git-help.html +++ b/git-help.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-help(1)</title> </head> @@ -272,24 +320,24 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git help</em> [-a|--all|-i|--info|-m|--man|-w|--web] [COMMAND]</p> +<div class="para"><p><em>git help</em> [-a|--all|-i|--info|-m|--man|-w|--web] [COMMAND]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>With no options and no COMMAND given, the synopsis of the <em>git</em> +<div class="para"><p>With no options and no COMMAND given, the synopsis of the <em>git</em> command and a list of the most commonly used git commands are printed -on the standard output.</p> -<p>If the option <em>--all</em> or <em>-a</em> is given, then all available commands are -printed on the standard output.</p> -<p>If a git command is named, a manual page for that command is brought +on the standard output.</p></div> +<div class="para"><p>If the option <em>--all</em> or <em>-a</em> is given, then all available commands are +printed on the standard output.</p></div> +<div class="para"><p>If a git command is named, a manual page for that command is brought up. The <em>man</em> program is used by default for this purpose, but this -can be overridden by other options or configuration variables.</p> -<p>Note that <em>git --help …</em> is identical as <em>git help …</em> because the -former is internally converted into the latter.</p> +can be overridden by other options or configuration variables.</p></div> +<div class="para"><p>Note that <tt>git --help …</tt> is identical to <tt>git help …</tt> because the +former is internally converted into the latter.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -a </dt> @@ -326,9 +374,9 @@ option may be used to override a value set in the <em>help.format</em> configuration variable. </p> -<p>By default the <em>man</em> program will be used to display the manual page, +<div class="para"><p>By default the <em>man</em> program will be used to display the manual page, but the <em>man.viewer</em> configuration variable may be used to choose -other display programs (see below).</p> +other display programs (see below).</p></div> </dd> <dt> -w @@ -341,22 +389,22 @@ Display manual page for the command in the <em>web</em> (HTML) format. A web browser will be used for that purpose. </p> -<p>The web browser can be specified using the configuration variable +<div class="para"><p>The web browser can be specified using the configuration variable <em>help.browser</em>, or <em>web.browser</em> if the former is not set. If none of -these config variables is set, the <tt>git-web--browse</tt> helper script -(called by <tt>git-help</tt>) will pick a suitable default. See -<a href="git-web--browse.html">git-web--browse(1)</a> for more information about this.</p> +these config variables is set, the <em>git-web--browse</em> helper script +(called by <em>git-help</em>) will pick a suitable default. See +<a href="git-web--browse.html">git-web--browse(1)</a> for more information about this.</p></div> </dd> -</dl> +</dl></div> </div> -<h2>CONFIGURATION VARIABLES</h2> +<h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2> <div class="sectionbody"> -<h3>help.format</h3> -<p>If no command line option is passed, the <em>help.format</em> configuration +<h3 id="_help_format">help.format</h3><div style="clear:left"></div> +<div class="para"><p>If no command line option is passed, the <em>help.format</em> configuration variable will be checked. The following values are supported for this -variable; they make <tt>git-help</tt> behave as their corresponding command -line option:</p> -<ul> +variable; they make <em>git-help</em> behave as their corresponding command +line option:</p></div> +<div class="ilist"><ul> <li> <p> "man" corresponds to <em>-m|--man</em>, @@ -372,16 +420,16 @@ "web" or "html" correspond to <em>-w|--web</em>. </p> </li> -</ul> -<h3>help.browser, web.browser and browser.<tool>.path</h3> -<p>The <em>help.browser</em>, <em>web.browser</em> and <em>browser.<tool>.path</em> will also +</ul></div> +<h3 id="_help_browser_web_browser_and_browser_lt_tool_gt_path">help.browser, web.browser and browser.<tool>.path</h3><div style="clear:left"></div> +<div class="para"><p>The <em>help.browser</em>, <em>web.browser</em> and <em>browser.<tool>.path</em> will also be checked if the <em>web</em> format is chosen (either by command line option or configuration variable). See <em>-w|--web</em> in the OPTIONS -section above and <a href="git-web--browse.html">git-web--browse(1)</a>.</p> -<h3>man.viewer</h3> -<p>The <em>man.viewer</em> config variable will be checked if the <em>man</em> format -is chosen. The following values are currently supported:</p> -<ul> +section above and <a href="git-web--browse.html">git-web--browse(1)</a>.</p></div> +<h3 id="_man_viewer">man.viewer</h3><div style="clear:left"></div> +<div class="para"><p>The <em>man.viewer</em> config variable will be checked if the <em>man</em> format +is chosen. The following values are currently supported:</p></div> +<div class="ilist"><ul> <li> <p> "man": use the <em>man</em> program as usual, @@ -399,44 +447,44 @@ tab (see <em>Note about konqueror</em> below). </p> </li> -</ul> -<p>Values for other tools can be used if there is a corresponding -<em>man.<tool>.cmd</em> configuration entry (see below).</p> -<p>Multiple values may be given to the <em>man.viewer</em> configuration +</ul></div> +<div class="para"><p>Values for other tools can be used if there is a corresponding +<em>man.<tool>.cmd</em> configuration entry (see below).</p></div> +<div class="para"><p>Multiple values may be given to the <em>man.viewer</em> configuration variable. Their corresponding programs will be tried in the order -listed in the configuration file.</p> -<p>For example, this configuration:</p> +listed in the configuration file.</p></div> +<div class="para"><p>For example, this configuration:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [man] viewer = konqueror viewer = woman</tt></pre> </div></div> -<p>will try to use konqueror first. But this may fail (for example if -DISPLAY is not set) and in that case emacs' woman mode will be tried.</p> -<p>If everything fails the <em>man</em> program will be tried anyway.</p> -<h3>man.<tool>.path</h3> -<p>You can explicitly provide a full path to your preferred man viewer by +<div class="para"><p>will try to use konqueror first. But this may fail (for example if +DISPLAY is not set) and in that case emacs' woman mode will be tried.</p></div> +<div class="para"><p>If everything fails the <em>man</em> program will be tried anyway.</p></div> +<h3 id="_man_lt_tool_gt_path">man.<tool>.path</h3><div style="clear:left"></div> +<div class="para"><p>You can explicitly provide a full path to your preferred man viewer by setting the configuration variable <em>man.<tool>.path</em>. For example, you can configure the absolute path to konqueror by setting -<em>man.konqueror.path</em>. Otherwise, <em>git help</em> assumes the tool is -available in PATH.</p> -<h3>man.<tool>.cmd</h3> -<p>When the man viewer, specified by the <em>man.viewer</em> configuration +<em>man.konqueror.path</em>. Otherwise, <em>git-help</em> assumes the tool is +available in PATH.</p></div> +<h3 id="_man_lt_tool_gt_cmd">man.<tool>.cmd</h3><div style="clear:left"></div> +<div class="para"><p>When the man viewer, specified by the <em>man.viewer</em> configuration variables, is not among the supported ones, then the corresponding <em>man.<tool>.cmd</em> configuration variable will be looked up. If this variable exists then the specified tool will be treated as a custom command and a shell eval will be used to run the command with the man -page passed as arguments.</p> -<h3>Note about konqueror</h3> -<p>When <em>konqueror</em> is specified in the <em>man.viewer</em> configuration +page passed as arguments.</p></div> +<h3 id="_note_about_konqueror">Note about konqueror</h3><div style="clear:left"></div> +<div class="para"><p>When <em>konqueror</em> is specified in the <em>man.viewer</em> configuration variable, we launch <em>kfmclient</em> to try to open the man page on an -already opened konqueror in a new tab if possible.</p> -<p>For consistency, we also try such a trick if <em>man.konqueror.path</em> is +already opened konqueror in a new tab if possible.</p></div> +<div class="para"><p>For consistency, we also try such a trick if <em>man.konqueror.path</em> is set to something like <em>A_PATH_TO/konqueror</em>. That means we will try to -launch <em>A_PATH_TO/kfmclient</em> instead.</p> -<p>If you really want to use <em>konqueror</em>, then you can use something like -the following:</p> +launch <em>A_PATH_TO/kfmclient</em> instead.</p></div> +<div class="para"><p>If you really want to use <em>konqueror</em>, then you can use something like +the following:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [man] @@ -445,35 +493,35 @@ [man "konq"] cmd = A_PATH_TO/konqueror</tt></pre> </div></div> -<h3>Note about git config --global</h3> -<p>Note that all these configuration variables should probably be set -using the <em>--global</em> flag, for example like this:</p> +<h3 id="_note_about_git_config_global">Note about git config --global</h3><div style="clear:left"></div> +<div class="para"><p>Note that all these configuration variables should probably be set +using the <em>--global</em> flag, for example like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git config --global help.format web $ git config --global web.browser firefox</tt></pre> </div></div> -<p>as they are probably more user specific than repository specific. -See <a href="git-config.html">git-config(1)</a> for more information about this.</p> +<div class="para"><p>as they are probably more user specific than repository specific. +See <a href="git-config.html">git-config(1)</a> for more information about this.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <gitster@pobox.com> and the git-list -<git@vger.kernel.org>.</p> +<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com> and the git-list +<git@vger.kernel.org>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Initial documentation was part of the <a href="git.html">git(1)</a> man page. +<div class="para"><p>Initial documentation was part of the <a href="git.html">git(1)</a> man page. Christian Couder <chriscool@tuxfamily.org> extracted and rewrote it a -little. Maintenance is done by the git-list <git@vger.kernel.org>.</p> +little. Maintenance is done by the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:48 UTC +Last updated 2008-07-06 05:16:50 UTC </div> </div> </body> diff --git a/git-help.txt b/git-help.txt index 5ace863..f414583 100644 --- a/git-help.txt +++ b/git-help.txt
@@ -23,7 +23,7 @@ up. The 'man' program is used by default for this purpose, but this can be overridden by other options or configuration variables. -Note that 'git --help ...' is identical as 'git help ...' because the +Note that `git --help ...` is identical to `git help ...` because the former is internally converted into the latter. OPTIONS @@ -55,8 +55,8 @@ + The web browser can be specified using the configuration variable 'help.browser', or 'web.browser' if the former is not set. If none of -these config variables is set, the `git-web--browse` helper script -(called by `git-help`) will pick a suitable default. See +these config variables is set, the 'git-web--browse' helper script +(called by 'git-help') will pick a suitable default. See linkgit:git-web--browse[1] for more information about this. CONFIGURATION VARIABLES @@ -67,7 +67,7 @@ If no command line option is passed, the 'help.format' configuration variable will be checked. The following values are supported for this -variable; they make `git-help` behave as their corresponding command +variable; they make 'git-help' behave as their corresponding command line option: * "man" corresponds to '-m|--man', @@ -120,7 +120,7 @@ You can explicitly provide a full path to your preferred man viewer by setting the configuration variable 'man.<tool>.path'. For example, you can configure the absolute path to konqueror by setting -'man.konqueror.path'. Otherwise, 'git help' assumes the tool is +'man.konqueror.path'. Otherwise, 'git-help' assumes the tool is available in PATH. man.<tool>.cmd
diff --git a/git-http-fetch.html b/git-http-fetch.html index 5ed9ef2..028bd92 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-http-fetch(1)</title> </head> @@ -272,15 +320,15 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git http-fetch</em> [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url></p> +<div class="para"><p><em>git http-fetch</em> [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Downloads a remote git repository via HTTP.</p> +<div class="para"><p>Downloads a remote git repository via HTTP.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> commit-id </dt> @@ -337,7 +385,7 @@ <dd> <p> Instead of a commit id on the command line (which is not expected in this - case), <tt>git-http-fetch</tt> expects lines on stdin in the format + case), <em>git-http-fetch</em> expects lines on stdin in the format </p> <div class="literalblock"> <div class="content"> @@ -353,23 +401,23 @@ an earlier fetch is interrupted. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:48 UTC +Last updated 2008-07-06 05:16:50 UTC </div> </div> </body> diff --git a/git-http-fetch.txt b/git-http-fetch.txt index cfc5989..e7c7961 100644 --- a/git-http-fetch.txt +++ b/git-http-fetch.txt
@@ -35,7 +35,7 @@ --stdin:: Instead of a commit id on the command line (which is not expected in this - case), `git-http-fetch` expects lines on stdin in the format + case), 'git-http-fetch' expects lines on stdin in the format <commit-id>['\t'<filename-as-in--w>]
diff --git a/git-imap-send.html b/git-imap-send.html index 73fc271..7428167 100644 --- a/git-imap-send.html +++ b/git-imap-send.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-imap-send(1)</title> </head> @@ -272,21 +320,21 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git imap-send</em></p> +<div class="para"><p><em>git imap-send</em></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This command uploads a mailbox generated with git-format-patch +<div class="para"><p>This command uploads a mailbox generated with git-format-patch into an imap drafts folder. This allows patches to be sent as other email is sent with mail clients that cannot read mailbox -files directly.</p> -<p>Typical usage is something like:</p> -<p>git format-patch --signoff --stdout --attach origin | git imap-send</p> +files directly.</p></div> +<div class="para"><p>Typical usage is something like:</p></div> +<div class="para"><p>git format-patch --signoff --stdout --attach origin | git imap-send</p></div> </div> -<h2>CONFIGURATION</h2> +<h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<p><tt>git-imap-send</tt> requires the following values in the repository -configuration file (shown with examples):</p> +<div class="para"><p><em>git-imap-send</em> requires the following values in the repository +configuration file (shown with examples):</p></div> <div class="literalblock"> <div class="content"> <pre><tt>[imap] @@ -302,25 +350,25 @@ Port = 143</tt></pre> </div></div> </div> -<h2>BUGS</h2> +<h2 id="_bugs">BUGS</h2> <div class="sectionbody"> -<p>Doesn't handle lines starting with "From " in the message body.</p> +<div class="para"><p>Doesn't handle lines starting with "From " in the message body.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Derived from isync 1.0.1 by Mike McCormack.</p> +<div class="para"><p>Derived from isync 1.0.1 by Mike McCormack.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Mike McCormack</p> +<div class="para"><p>Documentation by Mike McCormack</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:49 UTC +Last updated 2008-07-06 05:16:50 UTC </div> </div> </body> diff --git a/git-imap-send.txt b/git-imap-send.txt index 776aa25..b3d8da3 100644 --- a/git-imap-send.txt +++ b/git-imap-send.txt
@@ -26,7 +26,7 @@ CONFIGURATION ------------- -`git-imap-send` requires the following values in the repository +'git-imap-send' requires the following values in the repository configuration file (shown with examples): ..........................
diff --git a/git-index-pack.html b/git-index-pack.html index b80cfb4..93e3f86 100644 --- a/git-index-pack.html +++ b/git-index-pack.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-index-pack(1)</title> </head> @@ -277,16 +325,16 @@ <em>git index-pack</em> --stdin [--fix-thin] [--keep] [-v] [-o <index-file>] [<pack-file>]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Reads a packed archive (.pack) from the specified file, and +<div class="para"><p>Reads a packed archive (.pack) from the specified file, and builds a pack index file (.idx) for it. The packed archive together with the pack index can then be placed in the -objects/pack/ directory of a git repository.</p> +objects/pack/ directory of a git repository.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -v </dt> @@ -320,7 +368,7 @@ a default name determined from the pack content. If <pack-file> is not specified consider using --keep to prevent a race condition between this process and - <tt>git-repack</tt>. + <em>git-repack</em>. </p> </dd> <dt> @@ -328,7 +376,7 @@ </dt> <dd> <p> - It is possible for <tt>git-pack-objects</tt> to build + It is possible for <em>git-pack-objects</em> to build "thin" pack, which records objects in deltified form based on objects not included in the pack to reduce network traffic. Those objects are expected to be present on the receiving end @@ -346,7 +394,7 @@ Before moving the index into its final destination create an empty .keep file for the associated pack file. This option is usually necessary with --stdin to prevent a - simultaneous <tt>git-repack</tt> process from deleting + simultaneous <em>git-repack</em> process from deleting the newly constructed pack and index before refs can be updated to use objects contained in the pack. </p> @@ -381,32 +429,32 @@ Die, if the pack contains broken objects or links. </p> </dd> -</dl> +</dl></div> </div> -<h2>Note</h2> +<h2 id="_note">Note</h2> <div class="sectionbody"> -<p>Once the index has been created, the list of object names is sorted +<div class="para"><p>Once the index has been created, the list of object names is sorted and the SHA1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either "pack\t", or "keep\t" if a new .keep file was successfully created. This is useful to remove a -.keep file used as a lock to prevent the race with <tt>git-repack</tt> -mentioned above.</p> +.keep file used as a lock to prevent the race with <em>git-repack</em> +mentioned above.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Sergey Vlasov <vsu@altlinux.ru></p> +<div class="para"><p>Written by Sergey Vlasov <vsu@altlinux.ru></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Sergey Vlasov</p> +<div class="para"><p>Documentation by Sergey Vlasov</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:49 UTC +Last updated 2008-07-06 05:16:51 UTC </div> </div> </body> diff --git a/git-index-pack.txt b/git-index-pack.txt index 1940237..4b5c743 100644 --- a/git-index-pack.txt +++ b/git-index-pack.txt
@@ -43,10 +43,10 @@ a default name determined from the pack content. If <pack-file> is not specified consider using --keep to prevent a race condition between this process and - `git-repack`. + 'git-repack'. --fix-thin:: - It is possible for `git-pack-objects` to build + It is possible for 'git-pack-objects' to build "thin" pack, which records objects in deltified form based on objects not included in the pack to reduce network traffic. Those objects are expected to be present on the receiving end @@ -59,7 +59,7 @@ Before moving the index into its final destination create an empty .keep file for the associated pack file. This option is usually necessary with --stdin to prevent a - simultaneous `git-repack` process from deleting + simultaneous 'git-repack' process from deleting the newly constructed pack and index before refs can be updated to use objects contained in the pack. @@ -86,7 +86,7 @@ and the SHA1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either "pack\t", or "keep\t" if a new .keep file was successfully created. This is useful to remove a -.keep file used as a lock to prevent the race with `git-repack` +.keep file used as a lock to prevent the race with 'git-repack' mentioned above.
diff --git a/git-init.html b/git-init.html index ccdb117..ba308c7 100644 --- a/git-init.html +++ b/git-init.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-init(1)</title> </head> @@ -272,11 +320,11 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git init</em> [-q | --quiet] [--bare] [--template=<template_directory>] [--shared[=<permissions>]]</p> +<div class="para"><p><em>git init</em> [-q | --quiet] [--bare] [--template=<template_directory>] [--shared[=<permissions>]]</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -q </dt> @@ -305,11 +353,11 @@ Provide the directory from which templates will be used. The default template directory is <tt>/usr/share/git-core/templates</tt>. </p> -<p>When specified, <tt><template_directory></tt> is used as the source of the template +<div class="para"><p>When specified, <tt><template_directory></tt> is used as the source of the template files rather than the default. The template files include some directory structure, some suggested "exclude patterns", and copies of non-executing "hook" files. The suggested patterns and hook files are all modifiable and -extensible.</p> +extensible.</p></div> </dd> <dt> --shared[={false|true|umask|group|all|world|everybody|0xxx}] @@ -323,9 +371,9 @@ requested permissions. When not specified, git will use permissions reported by umask(2). </p> -<p>The option can have the following values, defaulting to <em>group</em> if no value -is given:</p> -<ul> +<div class="para"><p>The option can have the following values, defaulting to <em>group</em> if no value +is given:</p></div> +<div class="ilist"><ul> <li> <p> <em>umask</em> (or <em>false</em>): Use permissions reported by umask(2). The default, @@ -352,39 +400,39 @@ can use this option. <em>0640</em> will create a repository which is group-readable but not writable. <em>0660</em> is equivalent to <em>group</em>. </p> -<p>By default, the configuration flag receive.denyNonFastForwards is enabled +<div class="para"><p>By default, the configuration flag receive.denyNonFastForwards is enabled in shared repositories, so that you cannot force a non fast-forwarding push -into it.</p> +into it.</p></div> </li> -</ul> +</ul></div> </dd> -</dl> +</dl></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This command creates an empty git repository - basically a <tt>.git</tt> directory +<div class="para"><p>This command creates an empty git repository - basically a <tt>.git</tt> directory with subdirectories for <tt>objects</tt>, <tt>refs/heads</tt>, <tt>refs/tags</tt>, and template files. An initial <tt>HEAD</tt> file that references the HEAD of the master branch -is also created.</p> -<p>If the <tt>$GIT_DIR</tt> environment variable is set then it specifies a path -to use instead of <tt>./.git</tt> for the base of the repository.</p> -<p>If the object storage directory is specified via the <tt>$GIT_OBJECT_DIRECTORY</tt> +is also created.</p></div> +<div class="para"><p>If the <tt>$GIT_DIR</tt> environment variable is set then it specifies a path +to use instead of <tt>./.git</tt> for the base of the repository.</p></div> +<div class="para"><p>If the object storage directory is specified via the <tt>$GIT_OBJECT_DIRECTORY</tt> environment variable then the sha1 directories are created underneath - -otherwise the default <tt>$GIT_DIR/objects</tt> directory is used.</p> -<p>Running <tt>git-init</tt> in an existing repository is safe. It will not overwrite -things that are already there. The primary reason for rerunning <tt>git-init</tt> -is to pick up newly added templates.</p> -<p>Note that <tt>git-init</tt> is the same as <tt>git-init-db</tt>. The command +otherwise the default <tt>$GIT_DIR/objects</tt> directory is used.</p></div> +<div class="para"><p>Running <em>git-init</em> in an existing repository is safe. It will not overwrite +things that are already there. The primary reason for rerunning <em>git-init</em> +is to pick up newly added templates.</p></div> +<div class="para"><p>Note that <em>git-init</em> is the same as <em>git-init-db</em>. The command was primarily meant to initialize the object database, but over time it has become responsible for setting up the other aspects of the repository, such as installing the default hooks and setting the configuration variables. The old name is retained -for backward compatibility reasons.</p> +for backward compatibility reasons.</p></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> Start a new git repository for an existing code base </dt> @@ -395,7 +443,7 @@ $ git init <b>(1)</b> $ git add . <b>(2)</b></tt></pre> </div></div> -<ol> +<div class="colist"><ol> <li> <p> prepare /path/to/my/codebase/.git directory @@ -406,25 +454,25 @@ add all existing file to the index </p> </li> -</ol> +</ol></div> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:49 UTC +Last updated 2008-07-06 05:16:51 UTC </div> </div> </body> diff --git a/git-init.txt b/git-init.txt index 4524473..71749c0 100644 --- a/git-init.txt +++ b/git-init.txt
@@ -86,11 +86,11 @@ environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used. -Running `git-init` in an existing repository is safe. It will not overwrite -things that are already there. The primary reason for rerunning `git-init` +Running 'git-init' in an existing repository is safe. It will not overwrite +things that are already there. The primary reason for rerunning 'git-init' is to pick up newly added templates. -Note that `git-init` is the same as `git-init-db`. The command +Note that 'git-init' is the same as 'git-init-db'. The command was primarily meant to initialize the object database, but over time it has become responsible for setting up the other aspects of the repository, such as installing the default hooks and
diff --git a/git-instaweb.html b/git-instaweb.html index 24b42b4..37e773d 100644 --- a/git-instaweb.html +++ b/git-instaweb.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-instaweb(1)</title> </head> @@ -277,14 +325,14 @@ [--browser=<browser>] <em>git instaweb</em> [--start] [--stop] [--restart]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>A simple script to set up <tt>gitweb</tt> and a web server for browsing the local -repository.</p> +<div class="para"><p>A simple script to set up <tt>gitweb</tt> and a web server for browsing the local +repository.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -l </dt> @@ -343,7 +391,7 @@ <dd> <p> The web browser that should be used to view the gitweb - page. This will be passed to the <tt>git-web--browse</tt> helper + page. This will be passed to the <em>git-web--browse</em> helper script along with the URL of the gitweb instance. See <a href="git-web--browse.html">git-web--browse(1)</a> for more information about this. If the script fails, the URL will be printed to stdout. @@ -377,11 +425,11 @@ any of the configuration files for spawning a new instance. </p> </dd> -</dl> +</dl></div> </div> -<h2>CONFIGURATION</h2> +<h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<p>You may specify configuration in your .git/config</p> +<div class="para"><p>You may specify configuration in your .git/config</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[instaweb] @@ -392,25 +440,25 @@ modulepath = /usr/lib/apache2/modules </tt></pre> </div></div> -<p>If the configuration variable <em>instaweb.browser</em> is not set, +<div class="para"><p>If the configuration variable <em>instaweb.browser</em> is not set, <em>web.browser</em> will be used instead if it is defined. See -<a href="git-web--browse.html">git-web--browse(1)</a> for more information about this.</p> +<a href="git-web--browse.html">git-web--browse(1)</a> for more information about this.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Eric Wong <normalperson@yhbt.net></p> +<div class="para"><p>Written by Eric Wong <normalperson@yhbt.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Eric Wong <normalperson@yhbt.net>.</p> +<div class="para"><p>Documentation by Eric Wong <normalperson@yhbt.net>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:50 UTC +Last updated 2008-07-06 05:16:51 UTC </div> </div> </body> diff --git a/git-instaweb.txt b/git-instaweb.txt index e7ca537..22da21a 100644 --- a/git-instaweb.txt +++ b/git-instaweb.txt
@@ -44,7 +44,7 @@ -b:: --browser:: The web browser that should be used to view the gitweb - page. This will be passed to the `git-web--browse` helper + page. This will be passed to the 'git-web--browse' helper script along with the URL of the gitweb instance. See linkgit:git-web--browse[1] for more information about this. If the script fails, the URL will be printed to stdout.
diff --git a/git-log.html b/git-log.html index 030962c..a980586 100644 --- a/git-log.html +++ b/git-log.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-log(1)</title> </head> @@ -272,19 +320,19 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git log</em> <option>…</p> +<div class="para"><p><em>git log</em> <option>…</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Shows the commit logs.</p> -<p>The command takes options applicable to the <tt>git-rev-list</tt> +<div class="para"><p>Shows the commit logs.</p></div> +<div class="para"><p>The command takes options applicable to the <em>git-rev-list</em> command to control what is shown and how, and options applicable to -the <tt>git-diff-*</tt> commands to control how the changes -each commit introduces are shown.</p> +the <em>git-diff-*</em> commands to control how the changes +each commit introduces are shown.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -p </dt> @@ -756,10 +804,10 @@ Do not show any source or destination prefix. </p> </dd> -</dl> -<p>For more detailed explanation on these common options, see also -<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p> -<dl> +</dl></div> +<div class="para"><p>For more detailed explanation on these common options, see also +<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div> +<div class="vlist"><dl> <dt> -<n> </dt> @@ -829,9 +877,9 @@ Show only commits that affect the specified paths. </p> </dd> -</dl> -<h3>Commit Formatting</h3> -<dl> +</dl></div> +<h3 id="_commit_formatting">Commit Formatting</h3><div style="clear:left"></div> +<div class="vlist"><dl> <dt> --pretty[=<em><format></em>] </dt> @@ -842,8 +890,8 @@ <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. When omitted, the format defaults to <em>medium</em>. </p> -<p>Note: you can specify the default pretty format in the repository -configuration (see <a href="git-config.html">git-config(1)</a>).</p> +<div class="para"><p>Note: you can specify the default pretty format in the repository +configuration (see <a href="git-config.html">git-config(1)</a>).</p></div> </dd> <dt> --abbrev-commit @@ -855,8 +903,8 @@ digits can be specified with "--abbrev=<n>" (which also modifies diff output, if it is displayed). </p> -<p>This should make "--pretty=oneline" a whole lot more readable for -people using 80-column terminals.</p> +<div class="para"><p>This should make "--pretty=oneline" a whole lot more readable for +people using 80-column terminals.</p></div> </dd> <dt> --encoding[=<encoding>] @@ -887,15 +935,15 @@ as when using "--pretty". <tt>log.date</tt> config variable sets a default value for log command's --date option. </p> -<p><tt>--date=relative</tt> shows dates relative to the current time, -e.g. "2 hours ago".</p> -<p><tt>--date=local</tt> shows timestamps in user's local timezone.</p> -<p><tt>--date=iso</tt> (or <tt>--date=iso8601</tt>) shows timestamps in ISO 8601 format.</p> -<p><tt>--date=rfc</tt> (or <tt>--date=rfc2822</tt>) shows timestamps in RFC 2822 -format, often found in E-mail messages.</p> -<p><tt>--date=short</tt> shows only date but not time, in <tt>YYYY-MM-DD</tt> format.</p> -<p><tt>--date=default</tt> shows timestamps in the original timezone -(either committer's or author's).</p> +<div class="para"><p><tt>--date=relative</tt> shows dates relative to the current time, +e.g. "2 hours ago".</p></div> +<div class="para"><p><tt>--date=local</tt> shows timestamps in user's local timezone.</p></div> +<div class="para"><p><tt>--date=iso</tt> (or <tt>--date=iso8601</tt>) shows timestamps in ISO 8601 format.</p></div> +<div class="para"><p><tt>--date=rfc</tt> (or <tt>--date=rfc2822</tt>) shows timestamps in RFC 2822 +format, often found in E-mail messages.</p></div> +<div class="para"><p><tt>--date=short</tt> shows only date but not time, in <tt>YYYY-MM-DD</tt> format.</p></div> +<div class="para"><p><tt>--date=default</tt> shows timestamps in the original timezone +(either committer's or author's).</p></div> </dd> <dt> --parents @@ -915,7 +963,7 @@ the right with <tt>></tt>. If combined with <tt>--boundary</tt>, those commits are prefixed with <tt>-</tt>. </p> -<p>For example, if you have this topology:</p> +<div class="para"><p>For example, if you have this topology:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> y---b---b branch B @@ -924,7 +972,7 @@ / / \ o---x---a---a branch A</tt></pre> </div></div> -<p>you would get an output line this:</p> +<div class="para"><p>you would get an output line this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git rev-list --left-right --boundary --pretty=oneline A...B @@ -947,15 +995,15 @@ to be printed in between commits, in order for the graph history to be drawn properly. </p> -<p>This implies the <em>--topo-order</em> option by default, but the -<em>--date-order</em> option may also be specified.</p> +<div class="para"><p>This implies the <em>--topo-order</em> option by default, but the +<em>--date-order</em> option may also be specified.</p></div> </dd> -</dl> -<h3>Diff Formatting</h3> -<p>Below are listed options that control the formatting of diff output. +</dl></div> +<h3 id="_diff_formatting">Diff Formatting</h3><div style="clear:left"></div> +<div class="para"><p>Below are listed options that control the formatting of diff output. Some of them are specific to <a href="git-rev-list.html">git-rev-list(1)</a>, however other diff -options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p> -<dl> +options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p></div> +<div class="vlist"><dl> <dt> -c </dt> @@ -995,12 +1043,12 @@ Show the tree objects in the diff output. This implies <em>-r</em>. </p> </dd> -</dl> -<h3>Commit Limiting</h3> -<p>Besides specifying a range of commits that should be listed using the +</dl></div> +<h3 id="_commit_limiting">Commit Limiting</h3><div style="clear:left"></div> +<div class="para"><p>Besides specifying a range of commits that should be listed using the special notations explained in the description, additional commit -limiting may be applied.</p> -<dl> +limiting may be applied.</p></div> +<div class="vlist"><dl> <dt> -n <em>number</em> </dt> @@ -1195,8 +1243,8 @@ instead. Under <em>--pretty=oneline</em>, the commit message is prefixed with this information on the same line. </p> -<p>Cannot be combined with <em>--reverse</em>. -See also <a href="git-reflog.html">git-reflog(1)</a>.</p> +<div class="para"><p>Cannot be combined with <em>--reverse</em>. +See also <a href="git-reflog.html">git-reflog(1)</a>.</p></div> </dd> <dt> --merge @@ -1228,14 +1276,14 @@ only output commits that changes at least one of them, and also ignore merges that do not touch the given paths. </p> -<p>Use the <em>--sparse</em> flag to makes the command output all eligible commits +<div class="para"><p>Use the <em>--sparse</em> flag to makes the command output all eligible commits (still subject to count and age limitation), but apply merge -simplification nevertheless.</p> +simplification nevertheless.</p></div> </dd> -</dl> -<h3>Commit Ordering</h3> -<p>By default, the commits are shown in reverse chronological order.</p> -<dl> +</dl></div> +<h3 id="_commit_ordering">Commit Ordering</h3><div style="clear:left"></div> +<div class="para"><p>By default, the commits are shown in reverse chronological order.</p></div> +<div class="vlist"><dl> <dt> --topo-order </dt> @@ -1264,10 +1312,10 @@ Cannot be combined with <em>--walk-reflogs</em>. </p> </dd> -</dl> -<h3>Object Traversal</h3> -<p>These options are mostly targeted for packing of git repositories.</p> -<dl> +</dl></div> +<h3 id="_object_traversal">Object Traversal</h3><div style="clear:left"></div> +<div class="para"><p>These options are mostly targeted for packing of git repositories.</p></div> +<div class="vlist"><dl> <dt> --objects </dt> @@ -1316,11 +1364,11 @@ Overrides a previous --no-walk. </p> </dd> -</dl> +</dl></div> </div> -<h2>PRETTY FORMATS</h2> +<h2 id="_pretty_formats">PRETTY FORMATS</h2> <div class="sectionbody"> -<p>If the commit is a merge, and if the pretty-format +<div class="para"><p>If the commit is a merge, and if the pretty-format is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is inserted before the <em>Author:</em> line. This line begins with "Merge: " and the sha1s of ancestral commits are printed, @@ -1328,9 +1376,9 @@ necessarily be the list of the <strong>direct</strong> parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or -file.</p> -<p>Here are some additional details for each format:</p> -<ul> +file.</p></div> +<div class="para"><p>Here are some additional details for each format:</p></div> +<div class="ilist"><ul> <li> <p> <em>oneline</em> @@ -1339,7 +1387,7 @@ <div class="content"> <pre><tt><sha1> <title line></tt></pre> </div></div> -<p>This is designed to be as compact as possible.</p> +<div class="para"><p>This is designed to be as compact as possible.</p></div> </li> <li> <p> @@ -1363,7 +1411,7 @@ <div class="content"> <pre><tt>commit <sha1> Author: <author> -Date: <date></tt></pre> +Date: <author date></tt></pre> </div></div> <div class="literalblock"> <div class="content"> @@ -1401,9 +1449,9 @@ <div class="content"> <pre><tt>commit <sha1> Author: <author> -AuthorDate: <date & time> +AuthorDate: <author date> Commit: <committer> -CommitDate: <date & time></tt></pre> +CommitDate: <committer date></tt></pre> </div></div> <div class="literalblock"> <div class="content"> @@ -1422,7 +1470,7 @@ <div class="content"> <pre><tt>From <sha1> <date> From: <author> -Date: <date & time> +Date: <author date> Subject: [PATCH] <title line></tt></pre> </div></div> <div class="literalblock"> @@ -1434,31 +1482,31 @@ <p> <em>raw</em> </p> -<p>The <em>raw</em> format shows the entire commit exactly as +<div class="para"><p>The <em>raw</em> format shows the entire commit exactly as stored in the commit object. Notably, the SHA1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the true parent commits, without taking grafts nor history -simplification into account.</p> +simplification into account.</p></div> </li> <li> <p> <em>format:</em> </p> -<p>The <em>format:</em> format allows you to specify which information +<div class="para"><p>The <em>format:</em> format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with <em>%n</em> -instead of <em>\n</em>.</p> -<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em> -would show something like this:</p> +instead of <em>\n</em>.</p></div> +<div class="para"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em> +would show something like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago The title was >>t4119: test autocomputing -p<n> for traditional diff input.<< </tt></pre> </div></div> -<p>The placeholders are:</p> -<ul> +<div class="para"><p>The placeholders are:</p></div> +<div class="ilist"><ul> <li> <p> <em>%H</em>: commit hash @@ -1609,19 +1657,19 @@ <em>%x00</em>: print a byte from a hex code </p> </li> -</ul> +</ul></div> </li> <li> <p> <em>tformat:</em> </p> -<p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it +<div class="para"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it provides "terminator" semantics instead of "separator" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the "oneline" format does. -For example:</p> +For example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log -2 --pretty=format:%h 4da45bef \ @@ -1635,19 +1683,19 @@ 7134973</tt></pre> </div></div> </li> -</ul> +</ul></div> </div> -<h2>Generating patches with -p</h2> +<h2 id="_generating_patches_with_p">Generating patches with -p</h2> <div class="sectionbody"> -<p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run +<div class="para"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a <em>-p</em> option, "git diff" without the <em>--raw</em> option, or "git log" with the "-p" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the -GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p> -<p>What the -p option produces is slightly different from the traditional -diff format.</p> -<ol> +GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div> +<div class="para"><p>What the -p option produces is slightly different from the traditional +diff format.</p></div> +<div class="olist"><ol> <li> <p> It is preceded with a "git diff" header, that looks like @@ -1657,12 +1705,12 @@ <div class="content"> <pre><tt>diff --git a/file1 b/file2</tt></pre> </div></div> -<p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is +<div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, -<tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p> -<p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the +<tt>/dev/null</tt> is <em>not</em> used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div> +<div class="para"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the name of the source file of the rename/copy and the name of -the file that rename/copy produces, respectively.</p> +the file that rename/copy produces, respectively.</p></div> </li> <li> <p> @@ -1691,20 +1739,20 @@ pathname is put in double quotes. </p> </li> -</ol> -<p>The similarity index is the percentage of unchanged lines, and +</ol></div> +<div class="para"><p>The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old -file made it into the new one.</p> +file made it into the new one.</p></div> </div> -<h2>combined diff format</h2> +<h2 id="_combined_diff_format">combined diff format</h2> <div class="sectionbody"> -<p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or +<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or <em>--cc</em> option to produce <em>combined diff</em>. For showing a merge commit with "git log -p", this is the default format. -A <em>combined diff</em> format looks like this:</p> +A <em>combined diff</em> format looks like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>diff --combined describe.c @@ -1735,7 +1783,7 @@ initialized = 1; for_each_ref(get_name);</tt></pre> </div></div> -<ol> +<div class="olist"><ol> <li> <p> It is preceded with a "git diff" header, that looks like @@ -1745,7 +1793,7 @@ <div class="content"> <pre><tt>diff --combined file</tt></pre> </div></div> -<p>or like this (when <em>--cc</em> option is used):</p> +<div class="para"><p>or like this (when <em>--cc</em> option is used):</p></div> <div class="literalblock"> <div class="content"> <pre><tt>diff --c file</tt></pre> @@ -1763,11 +1811,11 @@ new file mode <mode> deleted file mode <mode>,<mode></tt></pre> </div></div> -<p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of +<div class="para"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two -<tree-ish> and are not used by combined diff format.</p> +<tree-ish> and are not used by combined diff format.</p></div> </li> <li> <p> @@ -1778,9 +1826,9 @@ <pre><tt>--- a/file +++ b/file</tt></pre> </div></div> -<p>Similar to two-line header for traditional <em>unified</em> diff +<div class="para"><p>Similar to two-line header for traditional <em>unified</em> diff format, <tt>/dev/null</tt> is used to signal created or deleted -files.</p> +files.</p></div> </li> <li> <p> @@ -1794,38 +1842,38 @@ <div class="content"> <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre> </div></div> -<p>There are (number of parents + 1) <tt>@</tt> characters in the chunk -header for combined diff format.</p> +<div class="para"><p>There are (number of parents + 1) <tt>@</tt> characters in the chunk +header for combined diff format.</p></div> </li> -</ol> -<p>Unlike the traditional <em>unified</em> diff format, which shows two +</ol></div> +<div class="para"><p>Unlike the traditional <em>unified</em> diff format, which shows two files A and B with a single column that has <tt>-</tt> (minus — appears in A but removed in B), <tt>+</tt> (plus — missing in A but added to B), or <tt>" "</tt> (space — unchanged) prefix, this format compares two or more files file1, file2,… with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is -different from it.</p> -<p>A <tt>-</tt> character in the column N means that the line appears in +different from it.</p></div> +<div class="para"><p>A <tt>-</tt> character in the column N means that the line appears in fileN but it does not appear in the result. A <tt>+</tt> character in the column N means that the line appears in the last file, and fileN does not have that line (in other words, the line was -added, from the point of view of that parent).</p> -<p>In the above example output, the function signature was changed +added, from the point of view of that parent).</p></div> +<div class="para"><p>In the above example output, the function signature was changed from both files (hence two <tt>-</tt> removals from both file1 and -file2, plus <tt>++</tt> to mean one line that was added does not appear +file2, plus <tt><tt>+</tt> to mean one line that was added does not appear in either file1 nor file2). Also two other lines are the same -from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p> -<p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a +from file1 but do not appear in file2 (hence prefixed with <tt> </tt></tt>).</p></div> +<div class="para"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by <tt>git diff-files -c</tt>, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka -"their version").</p> +"their version").</p></div> </div> -<h2>Examples</h2> +<h2 id="_examples">Examples</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> git log --no-merges </dt> @@ -1873,12 +1921,12 @@ present name. </p> </dd> -</dl> +</dl></div> </div> -<h2>Discussion</h2> +<h2 id="_discussion">Discussion</h2> <div class="sectionbody"> -<p>At the core level, git is character encoding agnostic.</p> -<ul> +<div class="para"><p>At the core level, git is character encoding agnostic.</p></div> +<div class="ilist"><ul> <li> <p> The pathnames recorded in the index and in the tree objects @@ -1902,17 +1950,17 @@ bytes. </p> </li> -</ul> -<p>Although we encourage that the commit log messages are encoded +</ul></div> +<div class="para"><p>Although we encourage that the commit log messages are encoded in UTF-8, both the core and git Porcelain are designed not to force UTF-8 on projects. If all participants of a particular project find it more convenient to use legacy encodings, git does not forbid it. However, there are a few things to keep in -mind.</p> -<ol> +mind.</p></div> +<div class="olist"><ol> <li> <p> -<tt>git-commit-tree</tt> (hence, <tt>git-commit</tt> which uses it) issues +<em>git-commit-tree</em> (hence, <em>git-commit</em> which uses it) issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to @@ -1923,14 +1971,14 @@ <pre><tt>[i18n] commitencoding = ISO-8859-1</tt></pre> </div></div> -<p>Commit objects created with the above setting record the value +<div class="para"><p>Commit objects created with the above setting record the value of <tt>i18n.commitencoding</tt> in its <tt>encoding</tt> header. This is to help other people who look at them later. Lack of this header -implies that the commit log message is encoded in UTF-8.</p> +implies that the commit log message is encoded in UTF-8.</p></div> </li> <li> <p> -<tt>git-log</tt>, <tt>git-show</tt> and friends looks at the <tt>encoding</tt> +<em>git-log</em>, <em>git-show</em> and friends looks at the <tt>encoding</tt> header of a commit object, and tries to re-code the log message into UTF-8 unless otherwise specified. You can specify the desired output encoding with @@ -1941,30 +1989,30 @@ <pre><tt>[i18n] logoutputencoding = ISO-8859-1</tt></pre> </div></div> -<p>If you do not have this configuration variable, the value of -<tt>i18n.commitencoding</tt> is used instead.</p> +<div class="para"><p>If you do not have this configuration variable, the value of +<tt>i18n.commitencoding</tt> is used instead.</p></div> </li> -</ol> -<p>Note that we deliberately chose not to re-code the commit log +</ol></div> +<div class="para"><p>Note that we deliberately chose not to re-code the commit log message when a commit is made to force UTF-8 at the commit object level, because re-coding to UTF-8 is not necessarily a -reversible operation.</p> +reversible operation.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:50 UTC +Last updated 2008-07-06 05:16:51 UTC </div> </div> </body> diff --git a/git-log.txt b/git-log.txt index 3373c26..5a58d5b 100644 --- a/git-log.txt +++ b/git-log.txt
@@ -14,9 +14,9 @@ ----------- Shows the commit logs. -The command takes options applicable to the `git-rev-list` +The command takes options applicable to the 'git-rev-list' command to control what is shown and how, and options applicable to -the `git-diff-*` commands to control how the changes +the 'git-diff-*' commands to control how the changes each commit introduces are shown.
diff --git a/git-ls-files.html b/git-ls-files.html index 7cb7be0..934a06d 100644 --- a/git-ls-files.html +++ b/git-ls-files.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-ls-files(1)</title> </head> @@ -283,17 +331,17 @@ [--error-unmatch] [--with-tree=<tree-ish>] [--full-name] [--abbrev] [--] [<file>]*</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This merges the file listing in the directory cache index with the +<div class="para"><p>This merges the file listing in the directory cache index with the actual working directory list, and shows different combinations of the -two.</p> -<p>One or more of the options below may be used to determine the files -shown:</p> +two.</p></div> +<div class="para"><p>One or more of the options below may be used to determine the files +shown:</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -c </dt> @@ -579,35 +627,35 @@ specified criteria are shown. </p> </dd> -</dl> +</dl></div> </div> -<h2>Output</h2> +<h2 id="_output">Output</h2> <div class="sectionbody"> -<p>show files just outputs the filename unless <em>--stage</em> is specified in -which case it outputs:</p> +<div class="para"><p>show files just outputs the filename unless <em>--stage</em> is specified in +which case it outputs:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>[<tag> ]<mode> <object> <stage> <file></tt></pre> </div></div> -<p><tt>git-ls-files --unmerged</tt> and <tt>git-ls-files --stage</tt> can be used to examine -detailed information on unmerged paths.</p> -<p>For an unmerged path, instead of recording a single mode/SHA1 pair, +<div class="para"><p><em>git-ls-files --unmerged</em> and <em>git-ls-files --stage</em> can be used to examine +detailed information on unmerged paths.</p></div> +<div class="para"><p>For an unmerged path, instead of recording a single mode/SHA1 pair, the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the -path. (see <a href="git-read-tree.html">git-read-tree(1)</a> for more information on state)</p> -<p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters +path. (see <a href="git-read-tree.html">git-read-tree(1)</a> for more information on state)</p></div> +<div class="para"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, -respectively.</p> +respectively.</p></div> </div> -<h2>Exclude Patterns</h2> +<h2 id="_exclude_patterns">Exclude Patterns</h2> <div class="sectionbody"> -<p><tt>git-ls-files</tt> can use a list of "exclude patterns" when +<div class="para"><p><em>git-ls-files</em> can use a list of "exclude patterns" when traversing the directory tree and finding files to show when the flags --others or --ignored are specified. <a href="gitignore.html">gitignore(5)</a> -specifies the format of exclude patterns.</p> -<p>These exclude patterns come from these places, in order:</p> -<ol> +specifies the format of exclude patterns.</p></div> +<div class="para"><p>These exclude patterns come from these places, in order:</p></div> +<div class="olist"><ol> <li> <p> The command line flag --exclude=<pattern> specifies a @@ -625,38 +673,38 @@ <li> <p> command line flag --exclude-per-directory=<name> specifies - a name of the file in each directory <tt>git-ls-files</tt> + a name of the file in each directory <em>git-ls-files</em> examines, normally <tt>.gitignore</tt>. Files in deeper directories take precedence. Patterns are ordered in the same order they appear in the files. </p> </li> -</ol> -<p>A pattern specified on the command line with --exclude or read +</ol></div> +<div class="para"><p>A pattern specified on the command line with --exclude or read from the file specified with --exclude-from is relative to the top of the directory tree. A pattern read from a file specified by --exclude-per-directory is relative to the directory that the -pattern file appears in.</p> +pattern file appears in.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-read-tree.html">git-read-tree(1)</a>, <a href="gitignore.html">gitignore(5)</a></p> +<div class="para"><p><a href="git-read-tree.html">git-read-tree(1)</a>, <a href="gitignore.html">gitignore(5)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:50 UTC +Last updated 2008-07-06 05:16:52 UTC </div> </div> </body> diff --git a/git-ls-files.txt b/git-ls-files.txt index a6883bf..f43af41 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt
@@ -143,7 +143,7 @@ [<tag> ]<mode> <object> <stage> <file> -`git-ls-files --unmerged` and `git-ls-files --stage` can be used to examine +'git-ls-files --unmerged' and 'git-ls-files --stage' can be used to examine detailed information on unmerged paths. For an unmerged path, instead of recording a single mode/SHA1 pair, @@ -160,7 +160,7 @@ Exclude Patterns ---------------- -`git-ls-files` can use a list of "exclude patterns" when +'git-ls-files' can use a list of "exclude patterns" when traversing the directory tree and finding files to show when the flags --others or --ignored are specified. linkgit:gitignore[5] specifies the format of exclude patterns. @@ -176,7 +176,7 @@ in the same order they appear in the file. 3. command line flag --exclude-per-directory=<name> specifies - a name of the file in each directory `git-ls-files` + a name of the file in each directory 'git-ls-files' examines, normally `.gitignore`. Files in deeper directories take precedence. Patterns are ordered in the same order they appear in the files.
diff --git a/git-ls-remote.html b/git-ls-remote.html index 731a890..a29ca8d 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-ls-remote(1)</title> </head> @@ -276,14 +324,14 @@ <div class="content"><em>git ls-remote</em> [--heads] [--tags] [-u <exec> | --upload-pack <exec>] <repository> <refs>…</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Displays references available in a remote repository along with the associated -commit IDs.</p> +<div class="para"><p>Displays references available in a remote repository along with the associated +commit IDs.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -h </dt> @@ -299,7 +347,7 @@ <dd> <p> Limit to only refs/heads and refs/tags, respectively. - These options are _not_ mutually exclusive; when given + These options are <em>not</em> mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. </p> @@ -312,7 +360,7 @@ </dt> <dd> <p> - Specify the full path of <tt>git-upload-pack</tt> on the remote + Specify the full path of <em>git-upload-pack</em> on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user. @@ -339,9 +387,9 @@ are displayed. </p> </dd> -</dl> +</dl></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> <div class="literalblock"> <div class="content"> @@ -363,17 +411,17 @@ 7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3</tt></pre> </div></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:51 UTC +Last updated 2008-07-06 05:16:52 UTC </div> </div> </body> diff --git a/git-ls-remote.txt b/git-ls-remote.txt index c267cda..4f25244 100644 --- a/git-ls-remote.txt +++ b/git-ls-remote.txt
@@ -31,7 +31,7 @@ -u <exec>:: --upload-pack=<exec>:: - Specify the full path of `git-upload-pack` on the remote + Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user.
diff --git a/git-mailinfo.html b/git-mailinfo.html index 6a61a95..6ebda7a 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-mailinfo(1)</title> </head> @@ -272,20 +320,20 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git mailinfo</em> [-k] [-u | --encoding=<encoding>] <msg> <patch></p> +<div class="para"><p><em>git mailinfo</em> [-k] [-u | --encoding=<encoding>] <msg> <patch></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Reading a single e-mail message from the standard input, and +<div class="para"><p>Reading a single e-mail message from the standard input, and writes the commit log message in <msg> file, and the patches in <patch> file. The author name, e-mail and e-mail subject are -written out to the standard output to be used by <tt>git-am</tt> +written out to the standard output to be used by <em>git-am</em> to create a commit. It is usually not necessary to use this -command directly. See <a href="git-am.html">git-am(1)</a> instead.</p> +command directly. See <a href="git-am.html">git-am(1)</a> instead.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -k </dt> @@ -297,7 +345,7 @@ whitespaces, (3) <em>[</em> up to <em>]</em>, typically <em>[PATCH]</em>, and then prepends "[PATCH] ". This flag forbids this munging, and is most useful when used to read back - <tt>git-format-patch -k</tt> output. + <em>git-format-patch -k</em> output. </p> </dd> <dt> @@ -310,8 +358,8 @@ transfer encoding, re-coded in UTF-8 by transliterating them. This used to be optional but now it is the default. </p> -<p>Note that the patch is always used as-is without charset -conversion, even with this flag.</p> +<div class="para"><p>Note that the patch is always used as-is without charset +conversion, even with this flag.</p></div> </dd> <dt> --encoding=<encoding> @@ -340,24 +388,24 @@ The patch extracted from e-mail. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and +Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:52 UTC +Last updated 2008-07-06 05:16:53 UTC </div> </div> </body> diff --git a/git-mailinfo.txt b/git-mailinfo.txt index 6ebdeee..cc52db3 100644 --- a/git-mailinfo.txt +++ b/git-mailinfo.txt
@@ -16,7 +16,7 @@ Reading a single e-mail message from the standard input, and writes the commit log message in <msg> file, and the patches in <patch> file. The author name, e-mail and e-mail subject are -written out to the standard output to be used by `git-am` +written out to the standard output to be used by 'git-am' to create a commit. It is usually not necessary to use this command directly. See linkgit:git-am[1] instead. @@ -30,7 +30,7 @@ whitespaces, (3) '[' up to ']', typically '[PATCH]', and then prepends "[PATCH] ". This flag forbids this munging, and is most useful when used to read back - `git-format-patch -k` output. + 'git-format-patch -k' output. -u:: The commit log message, author name and author email are
diff --git a/git-merge-base.html b/git-merge-base.html index 9c7cc1d..450530c 100644 --- a/git-merge-base.html +++ b/git-merge-base.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-merge-base(1)</title> </head> @@ -272,21 +320,21 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git merge-base</em> [--all] <commit> <commit></p> +<div class="para"><p><em>git merge-base</em> [--all] <commit> <commit></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p><tt>git-merge-base</tt> finds as good a common ancestor as possible between +<div class="para"><p><em>git-merge-base</em> finds as good a common ancestor as possible between the two commits. That is, given two commits A and B, <tt>git merge-base A B</tt> will output a commit which is reachable from both A and B through -the parent relationship.</p> -<p>Given a selection of equally good common ancestors it should not be -relied on to decide in any particular way.</p> -<p>The <tt>git-merge-base</tt> algorithm is still in flux - use the source…</p> +the parent relationship.</p></div> +<div class="para"><p>Given a selection of equally good common ancestors it should not be +relied on to decide in any particular way.</p></div> +<div class="para"><p>The <em>git-merge-base</em> algorithm is still in flux - use the source…</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --all </dt> @@ -296,23 +344,23 @@ just one. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:52 UTC +Last updated 2008-07-06 05:16:53 UTC </div> </div> </body> diff --git a/git-merge-base.txt b/git-merge-base.txt index 41fb0c7..1a7ecbf 100644 --- a/git-merge-base.txt +++ b/git-merge-base.txt
@@ -13,7 +13,7 @@ DESCRIPTION ----------- -`git-merge-base` finds as good a common ancestor as possible between +'git-merge-base' finds as good a common ancestor as possible between the two commits. That is, given two commits A and B, `git merge-base A B` will output a commit which is reachable from both A and B through the parent relationship. @@ -21,7 +21,7 @@ Given a selection of equally good common ancestors it should not be relied on to decide in any particular way. -The `git-merge-base` algorithm is still in flux - use the source... +The 'git-merge-base' algorithm is still in flux - use the source... OPTIONS -------
diff --git a/git-merge-file.html b/git-merge-file.html index d44d792..6dd32ec 100644 --- a/git-merge-file.html +++ b/git-merge-file.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-merge-file(1)</title> </head> @@ -276,18 +324,18 @@ <div class="content"><em>git merge-file</em> [-L <current-name> [-L <base-name> [-L <other-name>]]] [-p|--stdout] [-q|--quiet] <current-file> <base-file> <other-file></div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p><tt>git-file-merge</tt> incorporates all changes that lead from the <tt><base-file></tt> +<div class="para"><p><em>git-file-merge</em> incorporates all changes that lead from the <tt><base-file></tt> to <tt><other-file></tt> into <tt><current-file></tt>. The result ordinarily goes into -<tt><current-file></tt>. <tt>git-merge-file</tt> is useful for combining separate changes +<tt><current-file></tt>. <em>git-merge-file</em> is useful for combining separate changes to an original. Suppose <tt><base-file></tt> is the original, and both <tt><current-file></tt> and <tt><other-file></tt> are modifications of <tt><base-file></tt>. -Then <tt>git-merge-file</tt> combines both changes.</p> -<p>A conflict occurs if both <tt><current-file></tt> and <tt><other-file></tt> have changes -in a common segment of lines. If a conflict is found, <tt>git-merge-file</tt> +Then <em>git-merge-file</em> combines both changes.</p></div> +<div class="para"><p>A conflict occurs if both <tt><current-file></tt> and <tt><other-file></tt> have changes +in a common segment of lines. If a conflict is found, <em>git-merge-file</em> normally outputs a warning and brackets the conflict with <<<<<<< and ->>>>>>> lines. A typical conflict will look like this:</p> +>>>>>>> lines. A typical conflict will look like this:</p></div> <div class="literalblock"> <div class="content"> <pre><tt><<<<<<< A @@ -296,17 +344,17 @@ lines in file B >>>>>>> B</tt></pre> </div></div> -<p>If there are conflicts, the user should edit the result and delete one of -the alternatives.</p> -<p>The exit value of this program is negative on error, and the number of -conflicts otherwise. If the merge was clean, the exit value is 0.</p> -<p><tt>git-merge-file</tt> is designed to be a minimal clone of RCS <tt>merge</tt>; that is, it -implements all of RCS merge's functionality which is needed by -<a href="git.html">git(1)</a>.</p> +<div class="para"><p>If there are conflicts, the user should edit the result and delete one of +the alternatives.</p></div> +<div class="para"><p>The exit value of this program is negative on error, and the number of +conflicts otherwise. If the merge was clean, the exit value is 0.</p></div> +<div class="para"><p><em>git-merge-file</em> is designed to be a minimal clone of RCS <em>merge</em>; that is, it +implements all of RCS <em>merge</em>'s functionality which is needed by +<a href="git.html">git(1)</a>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -L <label> </dt> @@ -337,11 +385,11 @@ Quiet; do not warn about conflicts. </p> </dd> -</dl> +</dl></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> git merge-file README.my README README.upstream </dt> @@ -360,24 +408,24 @@ <tt>a</tt> and <tt>c</tt> instead of <tt>tmp/a123</tt> and <tt>tmp/c345</tt>. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Johannes Schindelin <johannes.schindelin@gmx.de></p> +<div class="para"><p>Written by Johannes Schindelin <johannes.schindelin@gmx.de></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>, -with parts copied from the original documentation of RCS merge.</p> +<div class="para"><p>Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>, +with parts copied from the original documentation of RCS <em>merge</em>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:52 UTC +Last updated 2008-07-06 05:16:53 UTC </div> </div> </body> diff --git a/git-merge-file.txt b/git-merge-file.txt index f057e49..024ec01 100644 --- a/git-merge-file.txt +++ b/git-merge-file.txt
@@ -15,15 +15,15 @@ DESCRIPTION ----------- -`git-file-merge` incorporates all changes that lead from the `<base-file>` +'git-file-merge' incorporates all changes that lead from the `<base-file>` to `<other-file>` into `<current-file>`. The result ordinarily goes into -`<current-file>`. `git-merge-file` is useful for combining separate changes +`<current-file>`. 'git-merge-file' is useful for combining separate changes to an original. Suppose `<base-file>` is the original, and both `<current-file>` and `<other-file>` are modifications of `<base-file>`. -Then `git-merge-file` combines both changes. +Then 'git-merge-file' combines both changes. A conflict occurs if both `<current-file>` and `<other-file>` have changes -in a common segment of lines. If a conflict is found, `git-merge-file` +in a common segment of lines. If a conflict is found, 'git-merge-file' normally outputs a warning and brackets the conflict with <<<<<<< and >>>>>>> lines. A typical conflict will look like this: @@ -39,8 +39,8 @@ The exit value of this program is negative on error, and the number of conflicts otherwise. If the merge was clean, the exit value is 0. -`git-merge-file` is designed to be a minimal clone of RCS `merge`; that is, it -implements all of RCS merge's functionality which is needed by +'git-merge-file' is designed to be a minimal clone of RCS 'merge'; that is, it +implements all of RCS 'merge''s functionality which is needed by linkgit:git[1]. @@ -85,7 +85,7 @@ Documentation -------------- Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>, -with parts copied from the original documentation of RCS merge. +with parts copied from the original documentation of RCS 'merge'. GIT ---
diff --git a/git-merge-index.html b/git-merge-index.html index 5c5e0f9..efd6ed3 100644 --- a/git-merge-index.html +++ b/git-merge-index.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-merge-index(1)</title> </head> @@ -272,18 +320,18 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git merge-index</em> [-o] [-q] <merge-program> (-a | [--] <file>*)</p> +<div class="para"><p><em>git merge-index</em> [-o] [-q] <merge-program> (-a | [--] <file>*)</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This looks up the <file>(s) in the index and, if there are any merge +<div class="para"><p>This looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty argument if no file), and <file> as argument 4. File modes for the three -files are passed as arguments 5, 6 and 7.</p> +files are passed as arguments 5, 6 and 7.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -- </dt> @@ -321,19 +369,19 @@ porcelains which might want to emit custom messages. </p> </dd> -</dl> -<p>If <tt>git-merge-index</tt> is called with multiple <file>s (or -a) then it +</dl></div> +<div class="para"><p>If <em>git-merge-index</em> is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit -code.</p> -<p>Typically this is run with a script calling git's imitation of -the merge command from the RCS package.</p> -<p>A sample script called <tt>git-merge-one-file</tt> is included in the -distribution.</p> -<p>ALERT ALERT ALERT! The git "merge object order" is different from the -RCS <tt>merge</tt> program merge object order. In the above ordering, the +code.</p></div> +<div class="para"><p>Typically this is run with a script calling git's imitation of +the <em>merge</em> command from the RCS package.</p></div> +<div class="para"><p>A sample script called <em>git-merge-one-file</em> is included in the +distribution.</p></div> +<div class="para"><p>ALERT ALERT ALERT! The git "merge object order" is different from the +RCS <em>merge</em> program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program -<tt>merge</tt> is to have the original in the middle. Don't ask me why.</p> -<p>Examples:</p> +<em>merge</em> is to have the original in the middle. Don't ask me why.</p></div> +<div class="para"><p>Examples:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>torvalds@ppc970:~/merge-test> git merge-index cat MM @@ -342,7 +390,7 @@ This is modified MM in the branch B. # merge2 This is modified MM in the branch B. # current contents</tt></pre> </div></div> -<p>or</p> +<div class="para"><p>or</p></div> <div class="literalblock"> <div class="content"> <pre><tt>torvalds@ppc970:~/merge-test> git merge-index cat AA MM @@ -352,27 +400,27 @@ This is added AA in the branch B. fatal: merge program failed</tt></pre> </div></div> -<p>where the latter example shows how <tt>git-merge-index</tt> will stop trying to +<div class="para"><p>where the latter example shows how <em>git-merge-index</em> will stop trying to merge once anything has returned an error (i.e., <tt>cat</tt> returned an error for the AA file, because it didn't exist in the original, and thus -<tt>git-merge-index</tt> didn't even try to merge the MM thing).</p> +<em>git-merge-index</em> didn't even try to merge the MM thing).</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org> -One-shot merge by Petr Baudis <pasky@ucw.cz></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> +One-shot merge by Petr Baudis <pasky@ucw.cz></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:53 UTC +Last updated 2008-07-06 05:16:53 UTC </div> </div> </body> diff --git a/git-merge-index.txt b/git-merge-index.txt index 4368084..ff088c5 100644 --- a/git-merge-index.txt +++ b/git-merge-index.txt
@@ -36,20 +36,20 @@ failure usually indicates conflicts during merge). This is for porcelains which might want to emit custom messages. -If `git-merge-index` is called with multiple <file>s (or -a) then it +If 'git-merge-index' is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code. Typically this is run with a script calling git's imitation of -the merge command from the RCS package. +the 'merge' command from the RCS package. -A sample script called `git-merge-one-file` is included in the +A sample script called 'git-merge-one-file' is included in the distribution. ALERT ALERT ALERT! The git "merge object order" is different from the -RCS `merge` program merge object order. In the above ordering, the +RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program -`merge` is to have the original in the middle. Don't ask me why. +'merge' is to have the original in the middle. Don't ask me why. Examples: @@ -68,10 +68,10 @@ This is added AA in the branch B. fatal: merge program failed -where the latter example shows how `git-merge-index` will stop trying to +where the latter example shows how 'git-merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus -`git-merge-index` didn't even try to merge the MM thing). +'git-merge-index' didn't even try to merge the MM thing). Author ------
diff --git a/git-merge-one-file.html b/git-merge-one-file.html index 03bcedf..d40203f 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-merge-one-file(1)</title> </head> @@ -272,29 +320,29 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git-merge-one-file</em></p> +<div class="para"><p><em>git-merge-one-file</em></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This is the standard helper program to use with <tt>git-merge-index</tt> -to resolve a merge after the trivial merge done with <tt>git-read-tree -m</tt>.</p> +<div class="para"><p>This is the standard helper program to use with <em>git-merge-index</em> +to resolve a merge after the trivial merge done with <em>git-read-tree -m</em>.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org>, -Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.</p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>, +Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:53 UTC +Last updated 2008-07-06 05:16:54 UTC </div> </div> </body> diff --git a/git-merge-one-file.txt b/git-merge-one-file.txt index 62e09af..1dd1345 100644 --- a/git-merge-one-file.txt +++ b/git-merge-one-file.txt
@@ -12,8 +12,8 @@ DESCRIPTION ----------- -This is the standard helper program to use with `git-merge-index` -to resolve a merge after the trivial merge done with `git-read-tree -m`. +This is the standard helper program to use with 'git-merge-index' +to resolve a merge after the trivial merge done with 'git-read-tree -m'. Author ------
diff --git a/git-merge.html b/git-merge.html index 12b4a4c..90992fc 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-merge(1)</title> </head> @@ -277,17 +325,17 @@ [-m <msg>] <remote> <remote>… <em>git merge</em> <msg> HEAD <remote>…</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This is the top-level interface to the merge machinery -which drives multiple merge strategy scripts.</p> -<p>The second syntax (<msg> <tt>HEAD</tt> <remote>) is supported for +<div class="para"><p>This is the top-level interface to the merge machinery +which drives multiple merge strategy scripts.</p></div> +<div class="para"><p>The second syntax (<msg> <tt>HEAD</tt> <remote>) is supported for historical reasons. Do not use it from the command line or in -new scripts. It is the same as <tt>git merge -m <msg> <remote></tt>.</p> +new scripts. It is the same as <tt>git merge -m <msg> <remote></tt>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --stat </dt> @@ -411,8 +459,8 @@ Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no <tt>-s</tt> option, a built-in list of strategies - is used instead (<tt>git-merge-recursive</tt> when merging a single - head, <tt>git-merge-octopus</tt> otherwise). + is used instead (<em>git-merge-recursive</em> when merging a single + head, <em>git-merge-octopus</em> otherwise). </p> </dd> <dt> @@ -421,8 +469,8 @@ <dd> <p> The commit message to be used for the merge commit (in case - it is created). The <tt>git-fmt-merge-msg</tt> script can be used - to give a good default for automated <tt>git-merge</tt> invocations. + it is created). The <em>git-fmt-merge-msg</em> script can be used + to give a good default for automated <em>git-merge</em> invocations. </p> </dd> <dt> @@ -435,11 +483,11 @@ obviously means you are trying an Octopus. </p> </dd> -</dl> +</dl></div> </div> -<h2>MERGE STRATEGIES</h2> +<h2 id="_merge_strategies">MERGE STRATEGIES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> resolve </dt> @@ -505,13 +553,13 @@ ancestor tree. </p> </dd> -</dl> -<p>If you tried a merge which resulted in a complex conflicts and -would want to start over, you can recover with <tt>git-reset</tt>.</p> +</dl></div> +<div class="para"><p>If you tried a merge which resulted in a complex conflicts and +would want to start over, you can recover with <em>git-reset</em>.</p></div> </div> -<h2>CONFIGURATION</h2> +<h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> merge.stat </dt> @@ -599,20 +647,20 @@ <dd> <p> Sets default options for merging into branch <name>. The syntax and - supported options are equal to that of <tt>git-merge</tt>, but option values + supported options are equal to that of <em>git-merge</em>, but option values containing whitespace characters are currently not supported. </p> </dd> -</dl> +</dl></div> </div> -<h2>HOW MERGE WORKS</h2> +<h2 id="_how_merge_works">HOW MERGE WORKS</h2> <div class="sectionbody"> -<p>A merge is always between the current <tt>HEAD</tt> and one or more +<div class="para"><p>A merge is always between the current <tt>HEAD</tt> and one or more commits (usually, branch head or tag), and the index file must exactly match the tree of <tt>HEAD</tt> commit (i.e. the contents of the last commit) when it happens. In other words, <tt>git diff --cached HEAD</tt> must -report no changes.</p> +report no changes.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -633,27 +681,27 @@ fail.</td> </tr></table> </div> -<p>Otherwise, merge will refuse to do any harm to your repository +<div class="para"><p>Otherwise, merge will refuse to do any harm to your repository (that is, it may fetch the objects from remote, and it may even update the local branch used to keep track of the remote branch with <tt>git pull remote rbranch:lbranch</tt>, but your working tree, -<tt>.git/HEAD</tt> pointer and index file are left intact).</p> -<p>You may have local modifications in the working tree files. In -other words, <tt>git-diff</tt> is allowed to report changes. +<tt>.git/HEAD</tt> pointer and index file are left intact).</p></div> +<div class="para"><p>You may have local modifications in the working tree files. In +other words, <em>git-diff</em> is allowed to report changes. However, the merge uses your working tree as the working area, and in order to prevent the merge operation from losing such changes, it makes sure that they do not interfere with the merge. Those complex tables in read-tree documentation define what it means for a path to "interfere with the merge". And if your local modifications interfere with the merge, again, it -stops before touching anything.</p> -<p>So in the above two "failed merge" case, you do not have to +stops before touching anything.</p></div> +<div class="para"><p>So in the above two "failed merge" case, you do not have to worry about loss of data --- you simply were not ready to do a merge, so no merge happened at all. You may want to finish whatever you were in the middle of doing, and retry the same -pull after you are done and ready.</p> -<p>When things cleanly merge, these things happen:</p> -<ol> +pull after you are done and ready.</p></div> +<div class="para"><p>When things cleanly merge, these things happen:</p></div> +<div class="olist"><ol> <li> <p> The results are updated both in the index file and in your @@ -675,8 +723,8 @@ The <tt>HEAD</tt> pointer gets advanced. </p> </li> -</ol> -<p>Because of 2., we require that the original state of the index +</ol></div> +<div class="para"><p>Because of 2., we require that the original state of the index file to match exactly the current <tt>HEAD</tt> commit; otherwise we will write out your local changes already registered in your index file along with the merge result, which is not good. @@ -684,9 +732,9 @@ branch and the remote branch you are pulling from during the merge (which is typically a fraction of the whole tree), you can have local modifications in your working tree as long as they do -not overlap with what the merge updates.</p> -<p>When there are conflicts, these things happen:</p> -<ol> +not overlap with what the merge updates.</p></div> +<div class="para"><p>When there are conflicts, these things happen:</p></div> +<div class="olist"><ol> <li> <p> <tt>HEAD</tt> stays the same. @@ -716,14 +764,14 @@ i.e. matching <tt>HEAD</tt>. </p> </li> -</ol> -<p>After seeing a conflict, you can do two things:</p> -<ul> +</ol></div> +<div class="para"><p>After seeing a conflict, you can do two things:</p></div> +<div class="ilist"><ul> <li> <p> Decide not to merge. The only clean-up you need are to reset the index file to the <tt>HEAD</tt> commit to reverse 2. and to clean - up working tree changes made by 2. and 3.; <tt>git-reset</tt> can + up working tree changes made by 2. and 3.; <em>git-reset</em> can be used for this. </p> </li> @@ -731,37 +779,37 @@ <p> Resolve the conflicts. <tt>git diff</tt> would report only the conflicting paths because of the above 2. and 3. Edit the - working tree files into a desirable shape, <tt>git-add</tt> or <tt>git-rm</tt> + working tree files into a desirable shape, <em>git-add</em> or <em>git-rm</em> them, to make the index file contain what the merge result - should be, and run <tt>git-commit</tt> to commit the result. + should be, and run <em>git-commit</em> to commit the result. </p> </li> -</ul> +</ul></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>, <a href="git-pull.html">git-pull(1)</a>, +<div class="para"><p><a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>, <a href="git-pull.html">git-pull(1)</a>, <a href="gitattributes.html">gitattributes(5)</a>, <a href="git-reset.html">git-reset(1)</a>, <a href="git-diff.html">git-diff(1)</a>, <a href="git-ls-files.html">git-ls-files(1)</a>, <a href="git-add.html">git-add(1)</a>, <a href="git-rm.html">git-rm(1)</a>, -<a href="git-mergetool.html">git-mergetool(1)</a></p> +<a href="git-mergetool.html">git-mergetool(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:53 UTC +Last updated 2008-07-06 05:16:54 UTC </div> </div> </body> diff --git a/git-merge.txt b/git-merge.txt index e6fa2b9..62f99b5 100644 --- a/git-merge.txt +++ b/git-merge.txt
@@ -29,8 +29,8 @@ -m <msg>:: The commit message to be used for the merge commit (in case - it is created). The `git-fmt-merge-msg` script can be used - to give a good default for automated `git-merge` invocations. + it is created). The 'git-fmt-merge-msg' script can be used + to give a good default for automated 'git-merge' invocations. <remote>:: Other branch head merged into our branch. You need at @@ -41,7 +41,7 @@ If you tried a merge which resulted in a complex conflicts and -would want to start over, you can recover with `git-reset`. +would want to start over, you can recover with 'git-reset'. CONFIGURATION ------------- @@ -49,7 +49,7 @@ branch.<name>.mergeoptions:: Sets default options for merging into branch <name>. The syntax and - supported options are equal to that of `git-merge`, but option values + supported options are equal to that of 'git-merge', but option values containing whitespace characters are currently not supported. HOW MERGE WORKS @@ -84,7 +84,7 @@ `.git/HEAD` pointer and index file are left intact). You may have local modifications in the working tree files. In -other words, `git-diff` is allowed to report changes. +other words, 'git-diff' is allowed to report changes. However, the merge uses your working tree as the working area, and in order to prevent the merge operation from losing such changes, it makes sure that they do not interfere with the @@ -140,14 +140,14 @@ * Decide not to merge. The only clean-up you need are to reset the index file to the `HEAD` commit to reverse 2. and to clean - up working tree changes made by 2. and 3.; `git-reset` can + up working tree changes made by 2. and 3.; 'git-reset' can be used for this. * Resolve the conflicts. `git diff` would report only the conflicting paths because of the above 2. and 3. Edit the - working tree files into a desirable shape, `git-add` or `git-rm` + working tree files into a desirable shape, 'git-add' or 'git-rm' them, to make the index file contain what the merge result - should be, and run `git-commit` to commit the result. + should be, and run 'git-commit' to commit the result. SEE ALSO
diff --git a/git-mergetool.html b/git-mergetool.html index fa1727f..0c7b646 100644 --- a/git-mergetool.html +++ b/git-mergetool.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-mergetool(1)</title> </head> @@ -272,20 +320,20 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git mergetool</em> [--tool=<tool>] [<file>]…</p> +<div class="para"><p><em>git mergetool</em> [--tool=<tool>] [<file>]…</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Use <tt>git mergetool</tt> to run one of several merge utilities to resolve -merge conflicts. It is typically run after <tt>git-merge</tt>.</p> -<p>If one or more <file> parameters are given, the merge tool program will +<div class="para"><p>Use <tt>git mergetool</tt> to run one of several merge utilities to resolve +merge conflicts. It is typically run after <em>git-merge</em>.</p></div> +<div class="para"><p>If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file. If no <file> names are -specified, <tt>git-mergetool</tt> will run the merge tool program on every file -with merge conflicts.</p> +specified, <em>git-mergetool</em> will run the merge tool program on every file +with merge conflicts.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -t or --tool=<tool> </dt> @@ -295,20 +343,20 @@ Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff </p> -<p>If a merge resolution program is not specified, <tt>git-mergetool</tt> +<div class="para"><p>If a merge resolution program is not specified, <em>git-mergetool</em> will use the configuration variable <tt>merge.tool</tt>. If the -configuration variable <tt>merge.tool</tt> is not set, <tt>git-mergetool</tt> -will pick a suitable default.</p> -<p>You can explicitly provide a full path to the tool by setting the +configuration variable <tt>merge.tool</tt> is not set, <em>git-mergetool</em> +will pick a suitable default.</p></div> +<div class="para"><p>You can explicitly provide a full path to the tool by setting the configuration variable <tt>mergetool.<tool>.path</tt>. For example, you can configure the absolute path to kdiff3 by setting -<tt>mergetool.kdiff3.path</tt>. Otherwise, <tt>git-mergetool</tt> assumes the -tool is available in PATH.</p> -<p>Instead of running one of the known merge tool programs -<tt>git-mergetool</tt> can be customized to run an alternative program +<tt>mergetool.kdiff3.path</tt>. Otherwise, <em>git-mergetool</em> assumes the +tool is available in PATH.</p></div> +<div class="para"><p>Instead of running one of the known merge tool programs +<em>git-mergetool</em> can be customized to run an alternative program by specifying the command line to invoke in a configration -variable <tt>mergetool.<tool>.cmd</tt>.</p> -<p>When <tt>git-mergetool</tt> is invoked with this tool (either through the +variable <tt>mergetool.<tool>.cmd</tt>.</p></div> +<div class="para"><p>When <em>git-mergetool</em> is invoked with this tool (either through the <tt>-t</tt> or <tt>--tool</tt> option or the <tt>merge.tool</tt> configuration variable) the configured command line will be invoked with <tt>$BASE</tt> set to the name of a temporary file containing the common base for @@ -317,30 +365,30 @@ <tt>$REMOTE</tt> set to the name of a temporary file containing the contents of the file to be merged, and <tt>$MERGED</tt> set to the name of the file to which the merge tool should write the result of the -merge resolution.</p> -<p>If the custom merge tool correctly indicates the success of a +merge resolution.</p></div> +<div class="para"><p>If the custom merge tool correctly indicates the success of a merge resolution with its exit code then the configuration variable <tt>mergetool.<tool>.trustExitCode</tt> can be set to <tt>true</tt>. -Otherwise, <tt>git-mergetool</tt> will prompt the user to indicate the -success of the resolution after the custom tool has exited.</p> +Otherwise, <em>git-mergetool</em> will prompt the user to indicate the +success of the resolution after the custom tool has exited.</p></div> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Theodore Y Ts'o <tytso@mit.edu></p> +<div class="para"><p>Written by Theodore Y Ts'o <tytso@mit.edu></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Theodore Y Ts'o.</p> +<div class="para"><p>Documentation by Theodore Y Ts'o.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:53 UTC +Last updated 2008-07-06 05:16:54 UTC </div> </div> </body> diff --git a/git-mergetool.txt b/git-mergetool.txt index fedcfa0..31570b1 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt
@@ -13,11 +13,11 @@ ----------- Use `git mergetool` to run one of several merge utilities to resolve -merge conflicts. It is typically run after `git-merge`. +merge conflicts. It is typically run after 'git-merge'. If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file. If no <file> names are -specified, `git-mergetool` will run the merge tool program on every file +specified, 'git-mergetool' will run the merge tool program on every file with merge conflicts. OPTIONS @@ -27,23 +27,23 @@ Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff + -If a merge resolution program is not specified, `git-mergetool` +If a merge resolution program is not specified, 'git-mergetool' will use the configuration variable `merge.tool`. If the -configuration variable `merge.tool` is not set, `git-mergetool` +configuration variable `merge.tool` is not set, 'git-mergetool' will pick a suitable default. + You can explicitly provide a full path to the tool by setting the configuration variable `mergetool.<tool>.path`. For example, you can configure the absolute path to kdiff3 by setting -`mergetool.kdiff3.path`. Otherwise, `git-mergetool` assumes the +`mergetool.kdiff3.path`. Otherwise, 'git-mergetool' assumes the tool is available in PATH. + Instead of running one of the known merge tool programs -`git-mergetool` can be customized to run an alternative program +'git-mergetool' can be customized to run an alternative program by specifying the command line to invoke in a configration variable `mergetool.<tool>.cmd`. + -When `git-mergetool` is invoked with this tool (either through the +When 'git-mergetool' is invoked with this tool (either through the `-t` or `--tool` option or the `merge.tool` configuration variable) the configured command line will be invoked with `$BASE` set to the name of a temporary file containing the common base for @@ -57,7 +57,7 @@ If the custom merge tool correctly indicates the success of a merge resolution with its exit code then the configuration variable `mergetool.<tool>.trustExitCode` can be set to `true`. -Otherwise, `git-mergetool` will prompt the user to indicate the +Otherwise, 'git-mergetool' will prompt the user to indicate the success of the resolution after the custom tool has exited. Author
diff --git a/git-name-rev.html b/git-name-rev.html index b7ea7ad..456e87c 100644 --- a/git-name-rev.html +++ b/git-name-rev.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-name-rev(1)</title> </head> @@ -276,14 +324,14 @@ <div class="content"><em>git name-rev</em> [--tags] [--refs=<pattern>] ( --all | --stdin | <committish>… )</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Finds symbolic names suitable for human digestion for revisions given in any -format parsable by <tt>git-rev-parse</tt>.</p> +<div class="para"><p>Finds symbolic names suitable for human digestion for revisions given in any +format parsable by <em>git-rev-parse</em>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --tags </dt> @@ -325,7 +373,7 @@ Instead of printing both the SHA-1 and the name, print only the name. If given with --tags the usual tag prefix of "tags/" is also omitted from the name, matching the output - of <tt>git-describe</tt> more closely. This option + of <em>git-describe</em> more closely. This option cannot be combined with --stdin. </p> </dd> @@ -346,42 +394,42 @@ Show uniquely abbreviated commit object as fallback. </p> </dd> -</dl> +</dl></div> </div> -<h2>EXAMPLE</h2> +<h2 id="_example">EXAMPLE</h2> <div class="sectionbody"> -<p>Given a commit, find out where it is relative to the local refs. Say somebody +<div class="para"><p>Given a commit, find out where it is relative to the local refs. Say somebody wrote you about that fantastic commit 33db5f4d9027a10e477ccf054b2c1ab94f74c85a. Of course, you look into the commit, but that only tells you what happened, but -not the context.</p> -<p>Enter <tt>git-name-rev</tt>:</p> +not the context.</p></div> +<div class="para"><p>Enter <em>git-name-rev</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a 33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99^0~940</tt></pre> </div></div> -<p>Now you are wiser, because you know that it happened 940 revisions before v0.99.</p> -<p>Another nice thing you can do is:</p> +<div class="para"><p>Now you are wiser, because you know that it happened 940 revisions before v0.99.</p></div> +<div class="para"><p>Another nice thing you can do is:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git log | git name-rev --stdin</tt></pre> </div></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Johannes Schindelin <Johannes.Schindelin@gmx.de></p> +<div class="para"><p>Written by Johannes Schindelin <Johannes.Schindelin@gmx.de></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Johannes Schindelin.</p> +<div class="para"><p>Documentation by Johannes Schindelin.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:54 UTC +Last updated 2008-07-06 05:16:54 UTC </div> </div> </body> diff --git a/git-name-rev.txt b/git-name-rev.txt index 00b1fa4..6e77ab1 100644 --- a/git-name-rev.txt +++ b/git-name-rev.txt
@@ -15,7 +15,7 @@ DESCRIPTION ----------- Finds symbolic names suitable for human digestion for revisions given in any -format parsable by `git-rev-parse`. +format parsable by 'git-rev-parse'. OPTIONS @@ -38,7 +38,7 @@ Instead of printing both the SHA-1 and the name, print only the name. If given with --tags the usual tag prefix of "tags/" is also omitted from the name, matching the output - of `git-describe` more closely. This option + of 'git-describe' more closely. This option cannot be combined with --stdin. --no-undefined:: @@ -56,7 +56,7 @@ Of course, you look into the commit, but that only tells you what happened, but not the context. -Enter `git-name-rev`: +Enter 'git-name-rev': ------------ % git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a
diff --git a/git-pack-objects.html b/git-pack-objects.html index b90d276..fa26241 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-pack-objects(1)</title> </head> @@ -277,31 +325,31 @@ [--local] [--incremental] [--window=N] [--depth=N] [--all-progress] [--revs [--unpacked | --all]*] [--stdout | base-name] < object-list</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Reads list of objects from the standard input, and writes a packed -archive with specified base-name, or to the standard output.</p> -<p>A packed archive is an efficient way to transfer set of objects +<div class="para"><p>Reads list of objects from the standard input, and writes a packed +archive with specified base-name, or to the standard output.</p></div> +<div class="para"><p>A packed archive is an efficient way to transfer set of objects between two repositories, and also is an archival format which is efficient to access. The packed archive format (.pack) is designed to be self contained so that it can be unpacked without any further information, but for fast, random access to the objects -in the pack, a pack index file (.idx) will be generated.</p> -<p>Placing both in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or +in the pack, a pack index file (.idx) will be generated.</p></div> +<div class="para"><p>Placing both in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or any of the directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES) -enables git to read from such an archive.</p> -<p>The <tt>git-unpack-objects</tt> command can read the packed archive and +enables git to read from such an archive.</p></div> +<div class="para"><p>The <em>git-unpack-objects</em> command can read the packed archive and expand the objects contained in the pack into "one-file one-object" format; this is typically done by the smart-pull commands when a pack is created on-the-fly for efficient network -transport by their peers.</p> -<p>In a packed archive, an object is either stored as a compressed +transport by their peers.</p></div> +<div class="para"><p>In a packed archive, an object is either stored as a compressed whole, or as a difference from some other object. The latter is -often called a delta.</p> +often called a delta.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> base-name </dt> @@ -332,7 +380,7 @@ <p> Read the revision arguments from the standard input, instead of individual object names. The revision arguments are processed - the same way as <tt>git-rev-list</tt> with the <tt>--objects</tt> flag + the same way as <em>git-rev-list</em> with the <tt>--objects</tt> flag uses its <tt>commit</tt> arguments to build the list of objects it outputs. The objects on the resulting list are packed. </p> @@ -525,7 +573,7 @@ A packed archive can express base object of a delta as either 20-byte object name or as an offset in the stream, but older version of git does not understand the - latter. By default, <tt>git-pack-objects</tt> only uses the + latter. By default, <em>git-pack-objects</em> only uses the former format for better compatibility. This option allows the command to use the latter format for compactness. Depending on the average delta chain @@ -558,29 +606,29 @@ 64-bit index entries on objects located above the given offset. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano</p> +<div class="para"><p>Documentation by Junio C Hamano</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-rev-list.html">git-rev-list(1)</a> +<div class="para"><p><a href="git-rev-list.html">git-rev-list(1)</a> <a href="git-repack.html">git-repack(1)</a> -<a href="git-prune-packed.html">git-prune-packed(1)</a></p> +<a href="git-prune-packed.html">git-prune-packed(1)</a></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:54 UTC +Last updated 2008-07-06 05:16:55 UTC </div> </div> </body> diff --git a/git-pack-objects.txt b/git-pack-objects.txt index d9cd16a..8c354bd 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt
@@ -30,7 +30,7 @@ any of the directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES) enables git to read from such an archive. -The `git-unpack-objects` command can read the packed archive and +The 'git-unpack-objects' command can read the packed archive and expand the objects contained in the pack into "one-file one-object" format; this is typically done by the smart-pull commands when a pack is created on-the-fly for efficient network @@ -59,7 +59,7 @@ --revs:: Read the revision arguments from the standard input, instead of individual object names. The revision arguments are processed - the same way as `git-rev-list` with the `--objects` flag + the same way as 'git-rev-list' with the `--objects` flag uses its `commit` arguments to build the list of objects it outputs. The objects on the resulting list are packed. @@ -170,7 +170,7 @@ A packed archive can express base object of a delta as either 20-byte object name or as an offset in the stream, but older version of git does not understand the - latter. By default, `git-pack-objects` only uses the + latter. By default, 'git-pack-objects' only uses the former format for better compatibility. This option allows the command to use the latter format for compactness. Depending on the average delta chain
diff --git a/git-pack-redundant.html b/git-pack-redundant.html index da6507b..e92e065 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-pack-redundant(1)</title> </head> @@ -272,22 +320,22 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git pack-redundant</em> [ --verbose ] [ --alt-odb ] < --all | .pack filename … ></p> +<div class="para"><p><em>git pack-redundant</em> [ --verbose ] [ --alt-odb ] < --all | .pack filename … ></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This program computes which packs in your repository +<div class="para"><p>This program computes which packs in your repository are redundant. The output is suitable for piping to -<tt>xargs rm</tt> if you are in the root of the repository.</p> -<p><tt>git-pack-redundant</tt> accepts a list of objects on standard input. Any objects +<tt>xargs rm</tt> if you are in the root of the repository.</p></div> +<div class="para"><p><em>git-pack-redundant</em> accepts a list of objects on standard input. Any objects given will be ignored when checking which packs are required. This makes the following command useful when wanting to remove packs which contain unreachable -objects.</p> -<p>git fsck --full --unreachable | cut -d <em> </em> -f3 | git pack-redundant --all | xargs rm</p> +objects.</p></div> +<div class="para"><p>git fsck --full --unreachable | cut -d <em> </em> -f3 | git pack-redundant --all | xargs rm</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --all </dt> @@ -313,29 +361,29 @@ Outputs some statistics to stderr. Has a small performance penalty. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Lukas Sandström <lukass@etek.chalmers.se></p> +<div class="para"><p>Written by Lukas Sandström <lukass@etek.chalmers.se></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Lukas Sandström <lukass@etek.chalmers.se></p> +<div class="para"><p>Documentation by Lukas Sandström <lukass@etek.chalmers.se></p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-pack-objects.html">git-pack-objects(1)</a> +<div class="para"><p><a href="git-pack-objects.html">git-pack-objects(1)</a> <a href="git-repack.html">git-repack(1)</a> -<a href="git-prune-packed.html">git-prune-packed(1)</a></p> +<a href="git-prune-packed.html">git-prune-packed(1)</a></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:55 UTC +Last updated 2008-07-06 05:16:55 UTC </div> </div> </body> diff --git a/git-pack-redundant.txt b/git-pack-redundant.txt index 80fc1ba..5f9435e 100644 --- a/git-pack-redundant.txt +++ b/git-pack-redundant.txt
@@ -16,7 +16,7 @@ are redundant. The output is suitable for piping to `xargs rm` if you are in the root of the repository. -`git-pack-redundant` accepts a list of objects on standard input. Any objects +'git-pack-redundant' accepts a list of objects on standard input. Any objects given will be ignored when checking which packs are required. This makes the following command useful when wanting to remove packs which contain unreachable objects.
diff --git a/git-parse-remote.html b/git-parse-remote.html index eed90d6..6cedede 100644 --- a/git-parse-remote.html +++ b/git-parse-remote.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-parse-remote(1)</title> </head> @@ -272,16 +320,16 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>. "$(git --exec-path)/git-parse-remote"</em></p> +<div class="para"><p><em>. "$(git --exec-path)/git-parse-remote"</em></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This script is included in various scripts to supply +<div class="para"><p>This script is included in various scripts to supply routines to parse files under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables that are related -to fetching, pulling and pushing.</p> -<p>The primary entry points are:</p> -<dl> +to fetching, pulling and pushing.</p></div> +<div class="para"><p>The primary entry points are:</p></div> +<div class="vlist"><dl> <dt> get_remote_refs_for_fetch </dt> @@ -304,29 +352,29 @@ <p> Given the list of user-supplied <tt><repo> <refspec>…</tt>, return the list of refs to push in a form suitable to be - fed to the <tt>git-send-pack</tt> command. When <tt><refspec>…</tt> + fed to the <em>git-send-pack</em> command. When <tt><refspec>…</tt> is empty the returned list of refs consists of the defaults for the given <tt><repo></tt>, if specified in <tt>$GIT_DIR/remotes/</tt>. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano.</p> +<div class="para"><p>Written by Junio C Hamano.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:55 UTC +Last updated 2008-07-06 05:16:55 UTC </div> </div> </body> diff --git a/git-parse-remote.txt b/git-parse-remote.txt index 421312e..cd43069 100644 --- a/git-parse-remote.txt +++ b/git-parse-remote.txt
@@ -32,7 +32,7 @@ get_remote_refs_for_push:: Given the list of user-supplied `<repo> <refspec>...`, return the list of refs to push in a form suitable to be - fed to the `git-send-pack` command. When `<refspec>...` + fed to the 'git-send-pack' command. When `<refspec>...` is empty the returned list of refs consists of the defaults for the given `<repo>`, if specified in `$GIT_DIR/remotes/`.
diff --git a/git-patch-id.html b/git-patch-id.html index 0e4645c..09916be 100644 --- a/git-patch-id.html +++ b/git-patch-id.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-patch-id(1)</title> </head> @@ -272,24 +320,24 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git patch-id</em> < <patch></p> +<div class="para"><p><em>git patch-id</em> < <patch></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>A "patch ID" is nothing but a SHA1 of the diff associated with a patch, with +<div class="para"><p>A "patch ID" is nothing but a SHA1 of the diff associated with a patch, with whitespace and line numbers ignored. As such, it's "reasonably stable", but at the same time also reasonably unique, i.e., two patches that have the same "patch -ID" are almost guaranteed to be the same thing.</p> -<p>IOW, you can use this thing to look for likely duplicate commits.</p> -<p>When dealing with <tt>git-diff-tree</tt> output, it takes advantage of +ID" are almost guaranteed to be the same thing.</p></div> +<div class="para"><p>IOW, you can use this thing to look for likely duplicate commits.</p></div> +<div class="para"><p>When dealing with <em>git-diff-tree</em> output, it takes advantage of the fact that the patch is prefixed with the object name of the commit, and outputs two 40-byte hexadecimal string. The first string is the patch ID, and the second string is the commit ID. -This can be used to make a mapping from patch ID to commit ID.</p> +This can be used to make a mapping from patch ID to commit ID.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <patch> </dt> @@ -298,23 +346,23 @@ The diff to create the ID of. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:55 UTC +Last updated 2008-07-06 05:16:56 UTC </div> </div> </body> diff --git a/git-patch-id.txt b/git-patch-id.txt index 17c178f..477785e 100644 --- a/git-patch-id.txt +++ b/git-patch-id.txt
@@ -18,7 +18,7 @@ IOW, you can use this thing to look for likely duplicate commits. -When dealing with `git-diff-tree` output, it takes advantage of +When dealing with 'git-diff-tree' output, it takes advantage of the fact that the patch is prefixed with the object name of the commit, and outputs two 40-byte hexadecimal string. The first string is the patch ID, and the second string is the commit ID.
diff --git a/git-peek-remote.html b/git-peek-remote.html index 06d6016..7abfb68 100644 --- a/git-peek-remote.html +++ b/git-peek-remote.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-peek-remote(1)</title> </head> @@ -272,21 +320,21 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git peek-remote</em> [--upload-pack=<git-upload-pack>] [<host>:]<directory></p> +<div class="para"><p><em>git peek-remote</em> [--upload-pack=<git-upload-pack>] [<host>:]<directory></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This command is deprecated; use <tt>git-ls-remote</tt> instead.</p> +<div class="para"><p>This command is deprecated; use <em>git-ls-remote</em> instead.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --upload-pack=<git-upload-pack> </dt> <dd> <p> - Use this to specify the path to <tt>git-upload-pack</tt> on the + Use this to specify the path to <em>git-upload-pack</em> on the remote side, if it is not found on your $PATH. Some installations of sshd ignores the user's environment setup scripts for login shells (e.g. .bash_profile) and @@ -304,7 +352,7 @@ <dd> <p> A remote host that houses the repository. When this - part is specified, <tt>git-upload-pack</tt> is invoked via + part is specified, <em>git-upload-pack</em> is invoked via ssh. </p> </dd> @@ -316,23 +364,23 @@ The repository to sync from. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano.</p> +<div class="para"><p>Documentation by Junio C Hamano.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:55 UTC +Last updated 2008-07-06 05:16:56 UTC </div> </div> </body> diff --git a/git-peek-remote.txt b/git-peek-remote.txt index c3ed4a1..79c03ee 100644 --- a/git-peek-remote.txt +++ b/git-peek-remote.txt
@@ -12,12 +12,12 @@ DESCRIPTION ----------- -This command is deprecated; use `git-ls-remote` instead. +This command is deprecated; use 'git-ls-remote' instead. OPTIONS ------- --upload-pack=<git-upload-pack>:: - Use this to specify the path to `git-upload-pack` on the + Use this to specify the path to 'git-upload-pack' on the remote side, if it is not found on your $PATH. Some installations of sshd ignores the user's environment setup scripts for login shells (e.g. .bash_profile) and @@ -30,7 +30,7 @@ <host>:: A remote host that houses the repository. When this - part is specified, `git-upload-pack` is invoked via + part is specified, 'git-upload-pack' is invoked via ssh. <directory>::
diff --git a/git-prune.html b/git-prune.html index e6bc772..28bd8a1 100644 --- a/git-prune.html +++ b/git-prune.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-prune(1)</title> </head> @@ -272,32 +320,32 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git-prune</em> [-n] [--expire <expire>] [--] [<head>…]</p> +<div class="para"><p><em>git-prune</em> [-n] [--expire <expire>] [--] [<head>…]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> <div class="admonitionblock"> <table><tr> <td class="icon"> <div class="title">Note</div> </td> -<td class="content">In most cases, users should run <tt>git-gc</tt>, which calls -<tt>git-prune</tt>. See the section "NOTES", below.</td> +<td class="content">In most cases, users should run <em>git-gc</em>, which calls +<em>git-prune</em>. See the section "NOTES", below.</td> </tr></table> </div> -<p>This runs <tt>git-fsck --unreachable</tt> using all the refs +<div class="para"><p>This runs <em>git-fsck --unreachable</em> using all the refs available in <tt>$GIT_DIR/refs</tt>, optionally with additional set of objects specified on the command line, and prunes all unpacked objects unreachable from any of these head objects from the object database. In addition, it prunes the unpacked objects that are also found in packs by -running <tt>git-prune-packed</tt>.</p> -<p>Note that unreachable, packed objects will remain. If this is -not desired, see <a href="git-repack.html">git-repack(1)</a>.</p> +running <em>git-prune-packed</em>.</p></div> +<div class="para"><p>Note that unreachable, packed objects will remain. If this is +not desired, see <a href="git-repack.html">git-repack(1)</a>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -n </dt> @@ -333,47 +381,47 @@ reachable from listed <head>s. </p> </dd> -</dl> +</dl></div> </div> -<h2>EXAMPLE</h2> +<h2 id="_example">EXAMPLE</h2> <div class="sectionbody"> -<p>To prune objects not used by your repository nor another that +<div class="para"><p>To prune objects not used by your repository nor another that borrows from your repository via its -<tt>.git/objects/info/alternates</tt>:</p> +<tt>.git/objects/info/alternates</tt>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git prune $(cd ../another && $(git rev-parse --all))</tt></pre> </div></div> </div> -<h2>Notes</h2> +<h2 id="_notes">Notes</h2> <div class="sectionbody"> -<p>In most cases, users will not need to call <tt>git-prune</tt> directly, but -should instead call <tt>git-gc</tt>, which handles pruning along with -many other housekeeping tasks.</p> -<p>For a description of which objects are considered for pruning, see -<tt>git-fsck</tt>'s --unreachable option.</p> +<div class="para"><p>In most cases, users will not need to call <em>git-prune</em> directly, but +should instead call <em>git-gc</em>, which handles pruning along with +many other housekeeping tasks.</p></div> +<div class="para"><p>For a description of which objects are considered for pruning, see +<em>git-fsck</em>'s --unreachable option.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-fsck.html">git-fsck(1)</a>, +<div class="para"><p><a href="git-fsck.html">git-fsck(1)</a>, <a href="git-gc.html">git-gc(1)</a>, -<a href="git-reflog.html">git-reflog(1)</a></p> +<a href="git-reflog.html">git-reflog(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:56 UTC +Last updated 2008-07-06 05:16:56 UTC </div> </div> </body> diff --git a/git-prune.txt b/git-prune.txt index a4a0d56..54f1dab 100644 --- a/git-prune.txt +++ b/git-prune.txt
@@ -13,16 +13,16 @@ DESCRIPTION ----------- -NOTE: In most cases, users should run `git-gc`, which calls -`git-prune`. See the section "NOTES", below. +NOTE: In most cases, users should run 'git-gc', which calls +'git-prune'. See the section "NOTES", below. -This runs `git-fsck --unreachable` using all the refs +This runs 'git-fsck --unreachable' using all the refs available in `$GIT_DIR/refs`, optionally with additional set of objects specified on the command line, and prunes all unpacked objects unreachable from any of these head objects from the object database. In addition, it prunes the unpacked objects that are also found in packs by -running `git-prune-packed`. +running 'git-prune-packed'. Note that unreachable, packed objects will remain. If this is not desired, see linkgit:git-repack[1]. @@ -59,12 +59,12 @@ Notes ----- -In most cases, users will not need to call `git-prune` directly, but -should instead call `git-gc`, which handles pruning along with +In most cases, users will not need to call 'git-prune' directly, but +should instead call 'git-gc', which handles pruning along with many other housekeeping tasks. For a description of which objects are considered for pruning, see -`git-fsck`'s --unreachable option. +'git-fsck''s --unreachable option. SEE ALSO --------
diff --git a/git-pull.html b/git-pull.html index 61be7a3..e4538cd 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-pull(1)</title> </head> @@ -272,22 +320,22 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git pull</em> <options> <repository> <refspec>…</p> +<div class="para"><p><em>git pull</em> <options> <repository> <refspec>…</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Runs <tt>git-fetch</tt> with the given parameters, and calls <tt>git-merge</tt> +<div class="para"><p>Runs <em>git-fetch</em> with the given parameters, and calls <em>git-merge</em> to merge the retrieved head(s) into the current branch. -With <tt>--rebase</tt>, calls <tt>git-rebase</tt> instead of <tt>git-merge</tt>.</p> -<p>Note that you can use <tt>.</tt> (current directory) as the +With <tt>--rebase</tt>, calls <em>git-rebase</em> instead of <em>git-merge</em>.</p></div> +<div class="para"><p>Note that you can use <tt>.</tt> (current directory) as the <repository> to pull from the local repository — this is useful -when merging local branches into the current branch.</p> -<p>Also note that options meant for <tt>git-pull</tt> itself and underlying -<tt>git-merge</tt> must be given before the options meant for <tt>git-fetch</tt>.</p> +when merging local branches into the current branch.</p></div> +<div class="para"><p>Also note that options meant for <em>git-pull</em> itself and underlying +<em>git-merge</em> must be given before the options meant for <em>git-fetch</em>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --stat </dt> @@ -411,12 +459,12 @@ Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no <tt>-s</tt> option, a built-in list of strategies - is used instead (<tt>git-merge-recursive</tt> when merging a single - head, <tt>git-merge-octopus</tt> otherwise). + is used instead (<em>git-merge-recursive</em> when merging a single + head, <em>git-merge-octopus</em> otherwise). </p> </dd> -</dl> -<dl> +</dl></div> +<div class="vlist"><dl> <dt> --rebase </dt> @@ -434,7 +482,7 @@ <td class="icon"> <div class="title">Note</div> </td> -<td class="content">This is a potentially _dangerous_ mode of operation. +<td class="content">This is a potentially <em>dangerous</em> mode of operation. It rewrites history, which does not bode well when you published that history already. Do <strong>not</strong> use this option unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td> @@ -504,7 +552,7 @@ </dt> <dd> <p> - When <tt>git-fetch</tt> is used with <tt><rbranch>:<lbranch></tt> + When <em>git-fetch</em> is used with <tt><rbranch>:<lbranch></tt> refspec, it refuses to update the local branch <tt><lbranch></tt> unless the remote branch <tt><rbranch></tt> it fetches is a descendant of <tt><lbranch></tt>. This option @@ -556,10 +604,10 @@ </dt> <dd> <p> - By default <tt>git-fetch</tt> refuses to update the head which + By default <em>git-fetch</em> refuses to update the head which corresponds to the current branch. This flag disables the - check. This is purely for the internal use for <tt>git-pull</tt> - to communicate with <tt>git-fetch</tt>, and unless you are + check. This is purely for the internal use for <em>git-pull</em> + to communicate with <em>git-fetch</em>, and unless you are implementing your own Porcelain you are not supposed to use it. </p> @@ -591,16 +639,16 @@ <dd> <p> The canonical format of a <refspec> parameter is - <tt>+?<src>:<dst></tt>; that is, an optional plus <tt>+</tt>, followed + <tt><tt>?<src>:<dst></tt>; that is, an optional plus <tt></tt></tt>, followed by the source ref, followed by a colon <tt>:</tt>, followed by the destination ref. </p> -<p>The remote ref that matches <src> +<div class="para"><p>The remote ref that matches <src> is fetched, and if <dst> is not empty string, the local ref that matches it is fast forwarded using <src>. Again, if the optional plus <tt>+</tt> is used, the local ref is updated even if it does not result in a fast forward -update.</p> +update.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -625,7 +673,7 @@ </td> <td class="content">You never do your own development on branches that appear on the right hand side of a <refspec> colon on <tt>Pull:</tt> lines; -they are to be updated by <tt>git-fetch</tt>. If you intend to do +they are to be updated by <em>git-fetch</em>. If you intend to do development derived from a remote branch <tt>B</tt>, have a <tt>Pull:</tt> line to track it (i.e. <tt>Pull: B:remote-B</tt>), and have a separate branch <tt>my-B</tt> to do your development on top of it. The latter @@ -642,13 +690,13 @@ <div class="title">Note</div> </td> <td class="content">There is a difference between listing multiple <refspec> -directly on <tt>git-pull</tt> command line and having multiple +directly on <em>git-pull</em> command line and having multiple <tt>Pull:</tt> <refspec> lines for a <repository> and running -<tt>git-pull</tt> command without any explicit <refspec> parameters. +<em>git-pull</em> command without any explicit <refspec> parameters. <refspec> listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote refs, you would be making -an Octopus. While <tt>git-pull</tt> run without any explicit <refspec> +an Octopus. While <em>git-pull</em> run without any explicit <refspec> parameter takes default <refspec>s from <tt>Pull:</tt> lines, it merges only the first <refspec> found into the current branch, after fetching all the remote refs. This is because making an @@ -657,8 +705,8 @@ is often useful.</td> </tr></table> </div> -<p>Some short-cut notations are also supported.</p> -<ul> +<div class="para"><p>Some short-cut notations are also supported.</p></div> +<div class="ilist"><ul> <li> <p> <tt>tag <tag></tt> means the same as <tt>refs/tags/<tag>:refs/tags/<tag></tt>; @@ -672,17 +720,17 @@ branch without storing the remote branch anywhere locally </p> </li> -</ul> +</ul></div> </dd> -</dl> +</dl></div> </div> -<h2>GIT URLS<a id="URLS"></a></h2> +<h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2> <div class="sectionbody"> -<p>One of the following notations can be used -to name the remote repository:</p> +<div class="para"><p>One of the following notations can be used +to name the remote repository:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> -<ul> +<div class="ilist"><ul> <li> <p> rsync://host.xz/path/to/repo.git/ @@ -728,17 +776,17 @@ ssh://[user@]host.xz/~/path/to/repo.git </p> </li> -</ul> +</ul></div> </div></div> -<p>SSH is the default transport protocol over the network. You can +<div class="para"><p>SSH is the default transport protocol over the network. You can optionally specify which user to log-in as, and an alternate, scp-like syntax is also supported. Both syntaxes support username expansion, as does the native git protocol, but only the former supports port specification. The following -three are identical to the last three above, respectively:</p> +three are identical to the last three above, respectively:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> -<ul> +<div class="ilist"><ul> <li> <p> [user@]host.xz:/path/to/repo.git/ @@ -754,12 +802,12 @@ [user@]host.xz:path/to/repo.git </p> </li> -</ul> +</ul></div> </div></div> -<p>To sync with a local directory, you can use:</p> +<div class="para"><p>To sync with a local directory, you can use:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> -<ul> +<div class="ilist"><ul> <li> <p> /path/to/repo.git/ @@ -770,34 +818,34 @@ file:///path/to/repo.git/ </p> </li> -</ul> +</ul></div> </div></div> -<p>They are mostly equivalent, except when cloning. See -<a href="git-clone.html">git-clone(1)</a> for details.</p> -<p>If there are a large number of similarly-named remote repositories and +<div class="para"><p>They are mostly equivalent, except when cloning. See +<a href="git-clone.html">git-clone(1)</a> for details.</p></div> +<div class="para"><p>If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a -configuration section of the form:</p> +configuration section of the form:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [url "<actual url base>"] insteadOf = <other url base></tt></pre> </div></div> -<p>For example, with this:</p> +<div class="para"><p>For example, with this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [url "git://git.host.xz/"] insteadOf = host.xz:/path/to/ insteadOf = work:</tt></pre> </div></div> -<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be -rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p> +<div class="para"><p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p></div> </div> -<h2>REMOTES<a id="REMOTES"></a></h2> +<h2 id="_remotes_a_id_remotes_a">REMOTES<a id="REMOTES"></a></h2> <div class="sectionbody"> -<p>The name of one of the following can be used instead -of a URL as <tt><repository></tt> argument:</p> -<ul> +<div class="para"><p>The name of one of the following can be used instead +of a URL as <tt><repository></tt> argument:</p></div> +<div class="ilist"><ul> <li> <p> a remote in the git configuration file: <tt>$GIT_DIR/config</tt>, @@ -813,17 +861,17 @@ a file in the <tt>$GIT_DIR/branches</tt> directory. </p> </li> -</ul> -<p>All of these also allow you to omit the refspec from the command line -because they each contain a refspec which git will use by default.</p> -<h3>Named remote in configuration file</h3> -<p>You can choose to provide the name of a remote which you had previously +</ul></div> +<div class="para"><p>All of these also allow you to omit the refspec from the command line +because they each contain a refspec which git will use by default.</p></div> +<h3 id="_named_remote_in_configuration_file">Named remote in configuration file</h3><div style="clear:left"></div> +<div class="para"><p>You can choose to provide the name of a remote which you had previously configured using <a href="git-remote.html">git-remote(1)</a>, <a href="git-config.html">git-config(1)</a> or even by a manual edit to the <tt>$GIT_DIR/config</tt> file. The URL of this remote will be used to access the repository. The refspec of this remote will be used by default when you do not provide a refspec on the command line. The entry in the -config file would appear like this:</p> +config file would appear like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [remote "<name>"] @@ -831,13 +879,13 @@ push = <refspec> fetch = <refspec></tt></pre> </div></div> -<h3>Named file in <tt>$GIT_DIR/remotes</tt></h3> -<p>You can choose to provide the name of a +<h3 id="_named_file_in_tt_git_dir_remotes_tt">Named file in <tt>$GIT_DIR/remotes</tt></h3><div style="clear:left"></div> +<div class="para"><p>You can choose to provide the name of a file in <tt>$GIT_DIR/remotes</tt>. The URL in this file will be used to access the repository. The refspec in this file will be used as default when you do not provide a refspec on the command line. This file should have the -following format:</p> +following format:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> URL: one of the above URL format @@ -845,32 +893,32 @@ Pull: <refspec> </tt></pre> </div></div> -<p><tt>Push:</tt> lines are used by <tt>git-push</tt> and -<tt>Pull:</tt> lines are used by <tt>git-pull</tt> and <tt>git-fetch</tt>. +<div class="para"><p><tt>Push:</tt> lines are used by <em>git-push</em> and +<tt>Pull:</tt> lines are used by <em>git-pull</em> and <em>git-fetch</em>. Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may -be specified for additional branch mappings.</p> -<h3>Named file in <tt>$GIT_DIR/branches</tt></h3> -<p>You can choose to provide the name of a +be specified for additional branch mappings.</p></div> +<h3 id="_named_file_in_tt_git_dir_branches_tt">Named file in <tt>$GIT_DIR/branches</tt></h3><div style="clear:left"></div> +<div class="para"><p>You can choose to provide the name of a file in <tt>$GIT_DIR/branches</tt>. The URL in this file will be used to access the repository. -This file should have the following format:</p> +This file should have the following format:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> <url>#<head></tt></pre> </div></div> -<p><tt><url></tt> is required; <tt>#<head></tt> is optional. +<div class="para"><p><tt><url></tt> is required; <tt>#<head></tt> is optional. When you do not provide a refspec on the command line, git will use the following refspec, where <tt><head></tt> defaults to <tt>master</tt>, and <tt><repository></tt> is the name of this file -you provided in the command line.</p> +you provided in the command line.</p></div> <div class="listingblock"> <div class="content"> <pre><tt> refs/heads/<head>:<repository></tt></pre> </div></div> </div> -<h2>MERGE STRATEGIES</h2> +<h2 id="_merge_strategies">MERGE STRATEGIES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> resolve </dt> @@ -936,46 +984,46 @@ ancestor tree. </p> </dd> -</dl> +</dl></div> </div> -<h2>DEFAULT BEHAVIOUR</h2> +<h2 id="_default_behaviour">DEFAULT BEHAVIOUR</h2> <div class="sectionbody"> -<p>Often people use <tt>git pull</tt> without giving any parameter. +<div class="para"><p>Often people use <tt>git pull</tt> without giving any parameter. Traditionally, this has been equivalent to saying <tt>git pull origin</tt>. However, when configuration <tt>branch.<name>.remote</tt> is present while on branch <tt><name></tt>, that value is used instead of -<tt>origin</tt>.</p> -<p>In order to determine what URL to use to fetch from, the value +<tt>origin</tt>.</p></div> +<div class="para"><p>In order to determine what URL to use to fetch from, the value of the configuration <tt>remote.<origin>.url</tt> is consulted and if there is not any such variable, the value on <tt>URL: </tt> line -in <tt>$GIT_DIR/remotes/<origin></tt> file is used.</p> -<p>In order to determine what remote branches to fetch (and +in <tt>$GIT_DIR/remotes/<origin></tt> file is used.</p></div> +<div class="para"><p>In order to determine what remote branches to fetch (and optionally store in the tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable <tt>remote.<origin>.fetch</tt> are consulted, and if there aren't any, <tt>$GIT_DIR/remotes/<origin></tt> file is consulted and its <tt>Pull: </tt> lines are used. In addition to the refspec formats described in the OPTIONS -section, you can have a globbing refspec that looks like this:</p> +section, you can have a globbing refspec that looks like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>refs/heads/*:refs/remotes/origin/*</tt></pre> </div></div> -<p>A globbing refspec must have a non-empty RHS (i.e. must store +<div class="para"><p>A globbing refspec must have a non-empty RHS (i.e. must store what were fetched in tracking branches), and its LHS and RHS must end with <tt>/*</tt>. The above specifies that all remote branches are tracked using tracking branches in -<tt>refs/remotes/origin/</tt> hierarchy under the same name.</p> -<p>The rule to determine which remote branch to merge after +<tt>refs/remotes/origin/</tt> hierarchy under the same name.</p></div> +<div class="para"><p>The rule to determine which remote branch to merge after fetching is a bit involved, in order not to break backward -compatibility.</p> -<p>If explicit refspecs were given on the command -line of <tt>git pull</tt>, they are all merged.</p> -<p>When no refspec was given on the command line, then <tt>git pull</tt> +compatibility.</p></div> +<div class="para"><p>If explicit refspecs were given on the command +line of <tt>git pull</tt>, they are all merged.</p></div> +<div class="para"><p>When no refspec was given on the command line, then <tt>git pull</tt> uses the refspec from the configuration or <tt>$GIT_DIR/remotes/<origin></tt>. In such cases, the following -rules apply:</p> -<ol> +rules apply:</p></div> +<div class="olist"><ol> <li> <p> If <tt>branch.<name>.merge</tt> configuration for the current @@ -993,11 +1041,11 @@ Otherwise the remote branch of the first refspec is merged. </p> </li> -</ol> +</ol></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<ul> +<div class="ilist"><ul> <li> <p> Update the remote-tracking branches for the repository @@ -1008,9 +1056,9 @@ <div class="content"> <pre><tt>$ git pull, git pull origin</tt></pre> </div></div> -<p>Normally the branch merged in is the HEAD of the remote repository, +<div class="para"><p>Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch.<name>.remote and -branch.<name>.merge options; see <a href="git-config.html">git-config(1)</a> for details.</p> +branch.<name>.merge options; see <a href="git-config.html">git-config(1)</a> for details.</p></div> </li> <li> <p> @@ -1020,8 +1068,8 @@ <div class="content"> <pre><tt>$ git pull origin next</tt></pre> </div></div> -<p>This leaves a copy of <tt>next</tt> temporarily in FETCH_HEAD, but -does not update any remote-tracking branches.</p> +<div class="para"><p>This leaves a copy of <tt>next</tt> temporarily in FETCH_HEAD, but +does not update any remote-tracking branches.</p></div> </li> <li> <p> @@ -1032,7 +1080,7 @@ <div class="content"> <pre><tt>$ git pull . fixes enhancements</tt></pre> </div></div> -<p>This <tt>git pull .</tt> syntax is equivalent to <tt>git merge</tt>.</p> +<div class="para"><p>This <tt>git pull .</tt> syntax is equivalent to <tt>git merge</tt>.</p></div> </li> <li> <p> @@ -1053,11 +1101,11 @@ <div class="content"> <pre><tt>$ git pull --no-commit . maint</tt></pre> </div></div> -<p>This can be used when you want to include further changes to the -merge, or want to write your own merge commit message.</p> -<p>You should refrain from abusing this option to sneak substantial +<div class="para"><p>This can be used when you want to include further changes to the +merge, or want to write your own merge commit message.</p></div> +<div class="para"><p>You should refrain from abusing this option to sneak substantial changes into a merge commit. Small fixups like bumping -release/version name would be acceptable.</p> +release/version name would be acceptable.</p></div> </li> <li> <p> @@ -1069,39 +1117,39 @@ $ git fetch origin +pu:pu maint:tmp $ git pull . tmp</tt></pre> </div></div> -<p>This updates (or creates, as necessary) branches <tt>pu</tt> and <tt>tmp</tt> in +<div class="para"><p>This updates (or creates, as necessary) branches <tt>pu</tt> and <tt>tmp</tt> in the local repository by fetching from the branches (respectively) -<tt>pu</tt> and <tt>maint</tt> from the remote repository.</p> -<p>The <tt>pu</tt> branch will be updated even if it is does not fast-forward; -the others will not be.</p> -<p>The final command then merges the newly fetched <tt>tmp</tt> into master.</p> +<tt>pu</tt> and <tt>maint</tt> from the remote repository.</p></div> +<div class="para"><p>The <tt>pu</tt> branch will be updated even if it is does not fast-forward; +the others will not be.</p></div> +<div class="para"><p>The final command then merges the newly fetched <tt>tmp</tt> into master.</p></div> </li> -</ul> -<p>If you tried a pull which resulted in a complex conflicts and -would want to start over, you can recover with <tt>git-reset</tt>.</p> +</ul></div> +<div class="para"><p>If you tried a pull which resulted in a complex conflicts and +would want to start over, you can recover with <em>git-reset</em>.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-fetch.html">git-fetch(1)</a>, <a href="git-merge.html">git-merge(1)</a>, <a href="git-config.html">git-config(1)</a></p> +<div class="para"><p><a href="git-fetch.html">git-fetch(1)</a>, <a href="git-merge.html">git-merge(1)</a>, <a href="git-config.html">git-config(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org> -and Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> +and Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Jon Loeliger, +<div class="para"><p>Documentation by Jon Loeliger, David Greaves, -Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:56 UTC +Last updated 2008-07-06 05:16:56 UTC </div> </div> </body> diff --git a/git-pull.txt b/git-pull.txt index d9537eb..092d1b8 100644 --- a/git-pull.txt +++ b/git-pull.txt
@@ -13,16 +13,16 @@ DESCRIPTION ----------- -Runs `git-fetch` with the given parameters, and calls `git-merge` +Runs 'git-fetch' with the given parameters, and calls 'git-merge' to merge the retrieved head(s) into the current branch. -With `--rebase`, calls `git-rebase` instead of `git-merge`. +With `--rebase`, calls 'git-rebase' instead of 'git-merge'. Note that you can use `.` (current directory) as the <repository> to pull from the local repository -- this is useful when merging local branches into the current branch. -Also note that options meant for `git-pull` itself and underlying -`git-merge` must be given before the options meant for `git-fetch`. +Also note that options meant for 'git-pull' itself and underlying +'git-merge' must be given before the options meant for 'git-fetch'. OPTIONS ------- @@ -182,7 +182,7 @@ If you tried a pull which resulted in a complex conflicts and -would want to start over, you can recover with `git-reset`. +would want to start over, you can recover with 'git-reset'. SEE ALSO
diff --git a/git-push.html b/git-push.html index 4697ad8..c08ddb5 100644 --- a/git-push.html +++ b/git-push.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-push(1)</title> </head> @@ -276,17 +324,17 @@ <div class="content"><em>git push</em> [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v | --verbose] [<repository> <refspec>…]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Updates remote refs using local refs, while sending objects -necessary to complete the given refs.</p> -<p>You can make interesting things happen to a repository +<div class="para"><p>Updates remote refs using local refs, while sending objects +necessary to complete the given refs.</p></div> +<div class="para"><p>You can make interesting things happen to a repository every time you push into it, by setting up <em>hooks</em> there. See -documentation for <a href="git-receive-pack.html">git-receive-pack(1)</a>.</p> +documentation for <a href="git-receive-pack.html">git-receive-pack(1)</a>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <repository> </dt> @@ -302,30 +350,30 @@ <dd> <p> The canonical format of a <refspec> parameter is - <tt>+?<src>:<dst></tt>; that is, an optional plus <tt>+</tt>, followed + <tt><tt>?<src>:<dst></tt>; that is, an optional plus <tt></tt></tt>, followed by the source ref, followed by a colon <tt>:</tt>, followed by the destination ref. </p> -<p>The <src> side represents the source branch (or arbitrary +<div class="para"><p>The <src> side represents the source branch (or arbitrary "SHA1 expression", such as <tt>master~4</tt> (four parents before the tip of <tt>master</tt> branch); see <a href="git-rev-parse.html">git-rev-parse(1)</a>) that you -want to push. The <dst> side represents the destination location.</p> -<p>The local ref that matches <src> is used +want to push. The <dst> side represents the destination location.</p></div> +<div class="para"><p>The local ref that matches <src> is used to fast forward the remote ref that matches <dst> (or, if no <dst> was specified, the same ref that <src> referred to locally). If the optional leading plus <tt>+</tt> is used, the remote ref is updated -even if it does not result in a fast forward update.</p> -<p><tt>tag <tag></tt> means the same as <tt>refs/tags/<tag>:refs/tags/<tag></tt>.</p> -<p>A parameter <ref> without a colon pushes the <ref> from the source -repository to the destination repository under the same name.</p> -<p>Pushing an empty <src> allows you to delete the <dst> ref from -the remote repository.</p> -<p>The special refspec <tt>:</tt> (or <tt>+:</tt> to allow non-fast forward updates) +even if it does not result in a fast forward update.</p></div> +<div class="para"><p><tt>tag <tag></tt> means the same as <tt>refs/tags/<tag>:refs/tags/<tag></tt>.</p></div> +<div class="para"><p>A parameter <ref> without a colon pushes the <ref> from the source +repository to the destination repository under the same name.</p></div> +<div class="para"><p>Pushing an empty <src> allows you to delete the <dst> ref from +the remote repository.</p></div> +<div class="para"><p>The special refspec <tt>:</tt> (or <tt>+:</tt> to allow non-fast forward updates) directs git to push "matching" heads: for every head that exists on the local side, the remote side is updated if a head of the same name already exists on the remote side. This is the default operation mode if no explicit refspec is found (that is neither on the command line -nor in any Push line of the corresponding remotes file---see below).</p> +nor in any Push line of the corresponding remotes file---see below).</p></div> </dd> <dt> --all @@ -375,7 +423,7 @@ </dt> <dd> <p> - Path to the <tt>git-receive-pack</tt> program on the remote + Path to the <em>git-receive-pack</em> program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH. @@ -420,7 +468,7 @@ </dt> <dd> <p> - These options are passed to <tt>git-send-pack</tt>. Thin + These options are passed to <em>git-send-pack</em>. Thin transfer spends extra cycles to minimize the number of objects to be sent and meant to be used on slower connection. </p> @@ -436,15 +484,15 @@ Run verbosely. </p> </dd> -</dl> +</dl></div> </div> -<h2>GIT URLS<a id="URLS"></a></h2> +<h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2> <div class="sectionbody"> -<p>One of the following notations can be used -to name the remote repository:</p> +<div class="para"><p>One of the following notations can be used +to name the remote repository:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> -<ul> +<div class="ilist"><ul> <li> <p> rsync://host.xz/path/to/repo.git/ @@ -490,17 +538,17 @@ ssh://[user@]host.xz/~/path/to/repo.git </p> </li> -</ul> +</ul></div> </div></div> -<p>SSH is the default transport protocol over the network. You can +<div class="para"><p>SSH is the default transport protocol over the network. You can optionally specify which user to log-in as, and an alternate, scp-like syntax is also supported. Both syntaxes support username expansion, as does the native git protocol, but only the former supports port specification. The following -three are identical to the last three above, respectively:</p> +three are identical to the last three above, respectively:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> -<ul> +<div class="ilist"><ul> <li> <p> [user@]host.xz:/path/to/repo.git/ @@ -516,12 +564,12 @@ [user@]host.xz:path/to/repo.git </p> </li> -</ul> +</ul></div> </div></div> -<p>To sync with a local directory, you can use:</p> +<div class="para"><p>To sync with a local directory, you can use:</p></div> <div class="exampleblock"> <div class="exampleblock-content"> -<ul> +<div class="ilist"><ul> <li> <p> /path/to/repo.git/ @@ -532,34 +580,34 @@ file:///path/to/repo.git/ </p> </li> -</ul> +</ul></div> </div></div> -<p>They are mostly equivalent, except when cloning. See -<a href="git-clone.html">git-clone(1)</a> for details.</p> -<p>If there are a large number of similarly-named remote repositories and +<div class="para"><p>They are mostly equivalent, except when cloning. See +<a href="git-clone.html">git-clone(1)</a> for details.</p></div> +<div class="para"><p>If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a -configuration section of the form:</p> +configuration section of the form:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [url "<actual url base>"] insteadOf = <other url base></tt></pre> </div></div> -<p>For example, with this:</p> +<div class="para"><p>For example, with this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [url "git://git.host.xz/"] insteadOf = host.xz:/path/to/ insteadOf = work:</tt></pre> </div></div> -<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be -rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p> +<div class="para"><p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p></div> </div> -<h2>REMOTES<a id="REMOTES"></a></h2> +<h2 id="_remotes_a_id_remotes_a">REMOTES<a id="REMOTES"></a></h2> <div class="sectionbody"> -<p>The name of one of the following can be used instead -of a URL as <tt><repository></tt> argument:</p> -<ul> +<div class="para"><p>The name of one of the following can be used instead +of a URL as <tt><repository></tt> argument:</p></div> +<div class="ilist"><ul> <li> <p> a remote in the git configuration file: <tt>$GIT_DIR/config</tt>, @@ -575,17 +623,17 @@ a file in the <tt>$GIT_DIR/branches</tt> directory. </p> </li> -</ul> -<p>All of these also allow you to omit the refspec from the command line -because they each contain a refspec which git will use by default.</p> -<h3>Named remote in configuration file</h3> -<p>You can choose to provide the name of a remote which you had previously +</ul></div> +<div class="para"><p>All of these also allow you to omit the refspec from the command line +because they each contain a refspec which git will use by default.</p></div> +<h3 id="_named_remote_in_configuration_file">Named remote in configuration file</h3><div style="clear:left"></div> +<div class="para"><p>You can choose to provide the name of a remote which you had previously configured using <a href="git-remote.html">git-remote(1)</a>, <a href="git-config.html">git-config(1)</a> or even by a manual edit to the <tt>$GIT_DIR/config</tt> file. The URL of this remote will be used to access the repository. The refspec of this remote will be used by default when you do not provide a refspec on the command line. The entry in the -config file would appear like this:</p> +config file would appear like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [remote "<name>"] @@ -593,13 +641,13 @@ push = <refspec> fetch = <refspec></tt></pre> </div></div> -<h3>Named file in <tt>$GIT_DIR/remotes</tt></h3> -<p>You can choose to provide the name of a +<h3 id="_named_file_in_tt_git_dir_remotes_tt">Named file in <tt>$GIT_DIR/remotes</tt></h3><div style="clear:left"></div> +<div class="para"><p>You can choose to provide the name of a file in <tt>$GIT_DIR/remotes</tt>. The URL in this file will be used to access the repository. The refspec in this file will be used as default when you do not provide a refspec on the command line. This file should have the -following format:</p> +following format:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> URL: one of the above URL format @@ -607,41 +655,41 @@ Pull: <refspec> </tt></pre> </div></div> -<p><tt>Push:</tt> lines are used by <tt>git-push</tt> and -<tt>Pull:</tt> lines are used by <tt>git-pull</tt> and <tt>git-fetch</tt>. +<div class="para"><p><tt>Push:</tt> lines are used by <em>git-push</em> and +<tt>Pull:</tt> lines are used by <em>git-pull</em> and <em>git-fetch</em>. Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may -be specified for additional branch mappings.</p> -<h3>Named file in <tt>$GIT_DIR/branches</tt></h3> -<p>You can choose to provide the name of a +be specified for additional branch mappings.</p></div> +<h3 id="_named_file_in_tt_git_dir_branches_tt">Named file in <tt>$GIT_DIR/branches</tt></h3><div style="clear:left"></div> +<div class="para"><p>You can choose to provide the name of a file in <tt>$GIT_DIR/branches</tt>. The URL in this file will be used to access the repository. -This file should have the following format:</p> +This file should have the following format:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> <url>#<head></tt></pre> </div></div> -<p><tt><url></tt> is required; <tt>#<head></tt> is optional. +<div class="para"><p><tt><url></tt> is required; <tt>#<head></tt> is optional. When you do not provide a refspec on the command line, git will use the following refspec, where <tt><head></tt> defaults to <tt>master</tt>, and <tt><repository></tt> is the name of this file -you provided in the command line.</p> +you provided in the command line.</p></div> <div class="listingblock"> <div class="content"> <pre><tt> refs/heads/<head>:<repository></tt></pre> </div></div> </div> -<h2>OUTPUT</h2> +<h2 id="_output">OUTPUT</h2> <div class="sectionbody"> -<p>The output of "git push" depends on the transport method used; this +<div class="para"><p>The output of "git push" depends on the transport method used; this section describes the output when pushing over the git protocol (either -locally or via ssh).</p> -<p>The status of the push is output in tabular form, with each line -representing the status of a single ref. Each line is of the form:</p> +locally or via ssh).</p></div> +<div class="para"><p>The status of the push is output in tabular form, with each line +representing the status of a single ref. Each line is of the form:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> <flag> <summary> <from> -> <to> (<reason>)</tt></pre> </div></div> -<dl> +<div class="vlist"><dl> <dt> flag </dt> @@ -703,11 +751,11 @@ failure is described. </p> </dd> -</dl> +</dl></div> </div> -<h2>Examples</h2> +<h2 id="_examples">Examples</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> git push origin master </dt> @@ -752,24 +800,24 @@ the ref name on its own will work. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net>, later rewritten in C -by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net>, later rewritten in C +by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:56 UTC +Last updated 2008-07-06 05:16:57 UTC </div> </div> </body> diff --git a/git-push.txt b/git-push.txt index 1f70e72..c44dce3 100644 --- a/git-push.txt +++ b/git-push.txt
@@ -85,7 +85,7 @@ line. --receive-pack=<git-receive-pack>:: - Path to the `git-receive-pack` program on the remote + Path to the 'git-receive-pack' program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH. @@ -106,7 +106,7 @@ --thin:: --no-thin:: - These options are passed to `git-send-pack`. Thin + These options are passed to 'git-send-pack'. Thin transfer spends extra cycles to minimize the number of objects to be sent and meant to be used on slower connection.
diff --git a/git-read-tree.html b/git-read-tree.html index f11717e..31d8eed 100644 --- a/git-read-tree.html +++ b/git-read-tree.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-read-tree(1)</title> </head> @@ -272,23 +320,23 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git read-tree</em> (<tree-ish> | [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]])</p> +<div class="para"><p><em>git read-tree</em> (<tree-ish> | [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]])</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Reads the tree information given by <tree-ish> into the index, +<div class="para"><p>Reads the tree information given by <tree-ish> into the index, but does not actually <strong>update</strong> any of the files it "caches". (see: -<a href="git-checkout-index.html">git-checkout-index(1)</a>)</p> -<p>Optionally, it can merge a tree into the index, perform a +<a href="git-checkout-index.html">git-checkout-index(1)</a>)</p></div> +<div class="para"><p>Optionally, it can merge a tree into the index, perform a fast-forward (i.e. 2-way) merge, or a 3-way merge, with the <tt>-m</tt> flag. When used with <tt>-m</tt>, the <tt>-u</tt> flag causes it to also update -the files in the work tree with the result of the merge.</p> -<p>Trivial merges are done by <tt>git-read-tree</tt> itself. Only conflicting paths -will be in unmerged state when <tt>git-read-tree</tt> returns.</p> +the files in the work tree with the result of the merge.</p></div> +<div class="para"><p>Trivial merges are done by <em>git-read-tree</em> itself. Only conflicting paths +will be in unmerged state when <em>git-read-tree</em> returns.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -m </dt> @@ -345,7 +393,7 @@ </dt> <dd> <p> - Restrict three-way merge by <tt>git-read-tree</tt> to happen + Restrict three-way merge by <em>git-read-tree</em> to happen only if there is no file-level merging required, instead of resolving merge for trivial cases and leaving conflicting files unresolved in the index. @@ -356,13 +404,13 @@ </dt> <dd> <p> - Usually a three-way merge by <tt>git-read-tree</tt> resolves + Usually a three-way merge by <em>git-read-tree</em> resolves the merge for really trivial cases and leaves other cases unresolved in the index, so that Porcelains can implement different merge policies. This flag makes the command to resolve a few more cases internally: </p> -<ul> +<div class="ilist"><ul> <li> <p> when one side removes a path and the other side leaves the path @@ -380,7 +428,7 @@ is to add that path. </p> </li> -</ul> +</ul></div> </dd> <dt> --prefix=<prefix>/ @@ -440,33 +488,33 @@ The id of the tree object(s) to be read/merged. </p> </dd> -</dl> +</dl></div> </div> -<h2>Merging</h2> +<h2 id="_merging">Merging</h2> <div class="sectionbody"> -<p>If <tt>-m</tt> is specified, <tt>git-read-tree</tt> can perform 3 kinds of +<div class="para"><p>If <tt>-m</tt> is specified, <em>git-read-tree</em> can perform 3 kinds of merge, a single tree merge if only 1 tree is given, a fast-forward merge with 2 trees, or a 3-way merge if 3 trees are -provided.</p> -<h3>Single Tree Merge</h3> -<p>If only 1 tree is specified, <tt>git-read-tree</tt> operates as if the user did not +provided.</p></div> +<h3 id="_single_tree_merge">Single Tree Merge</h3><div style="clear:left"></div> +<div class="para"><p>If only 1 tree is specified, <em>git-read-tree</em> operates as if the user did not specify <tt>-m</tt>, except that if the original index has an entry for a given pathname, and the contents of the path matches with the tree being read, the stat info from the index is used. (In other words, the -index's stat()s take precedence over the merged tree's).</p> -<p>That means that if you do a <tt>git read-tree -m <newtree></tt> followed by a -<tt>git checkout-index -f -u -a</tt>, the <tt>git-checkout-index</tt> only checks out -the stuff that really changed.</p> -<p>This is used to avoid unnecessary false hits when <tt>git-diff-files</tt> is -run after <tt>git-read-tree</tt>.</p> -<h3>Two Tree Merge</h3> -<p>Typically, this is invoked as <tt>git read-tree -m $H $M</tt>, where $H +index's stat()s take precedence over the merged tree's).</p></div> +<div class="para"><p>That means that if you do a <tt>git read-tree -m <newtree></tt> followed by a +<tt>git checkout-index -f -u -a</tt>, the <em>git-checkout-index</em> only checks out +the stuff that really changed.</p></div> +<div class="para"><p>This is used to avoid unnecessary false hits when <em>git-diff-files</em> is +run after <em>git-read-tree</em>.</p></div> +<h3 id="_two_tree_merge">Two Tree Merge</h3><div style="clear:left"></div> +<div class="para"><p>Typically, this is invoked as <tt>git read-tree -m $H $M</tt>, where $H is the head commit of the current repository, and $M is the head of a foreign tree, which is simply ahead of $H (i.e. we are in a -fast forward situation).</p> -<p>When two trees are specified, the user is telling <tt>git-read-tree</tt> -the following:</p> -<ol> +fast forward situation).</p></div> +<div class="para"><p>When two trees are specified, the user is telling <em>git-read-tree</em> +the following:</p></div> +<div class="olist"><ol> <li> <p> The current index and work tree is derived from $H, but @@ -478,10 +526,10 @@ The user wants to fast-forward to $M. </p> </li> -</ol> -<p>In this case, the <tt>git read-tree -m $H $M</tt> command makes sure +</ol></div> +<div class="para"><p>In this case, the <tt>git read-tree -m $H $M</tt> command makes sure that no local change is lost as the result of this "merge". -Here are the "carry forward" rules:</p> +Here are the "carry forward" rules:</p></div> <div class="literalblock"> <div class="content"> <pre><tt> I (index) H M Result @@ -530,11 +578,11 @@ 20 yes yes no exists exists use M 21 no yes no exists exists fail</tt></pre> </div></div> -<p>In all "keep index" cases, the index entry stays as in the +<div class="para"><p>In all "keep index" cases, the index entry stays as in the original index file. If the entry were not up to date, -<tt>git-read-tree</tt> keeps the copy in the work tree intact when -operating under the -u flag.</p> -<p>When this form of <tt>git-read-tree</tt> returns successfully, you can +<em>git-read-tree</em> keeps the copy in the work tree intact when +operating under the -u flag.</p></div> +<div class="para"><p>When this form of <em>git-read-tree</em> returns successfully, you can see what "local changes" you made are carried forward by running <tt>git diff-index --cached $M</tt>. Note that this does not necessarily match <tt>git diff-index --cached $H</tt> would have @@ -543,27 +591,27 @@ you picked it up via e-mail in a patch form), <tt>git diff-index --cached $H</tt> would have told you about the change before this merge, but it would not show in <tt>git diff-index --cached $M</tt> -output after two-tree merge.</p> -<h3>3-Way Merge</h3> -<p>Each "index" entry has two bits worth of "stage" state. stage 0 is the -normal one, and is the only one you'd see in any kind of normal use.</p> -<p>However, when you do <tt>git-read-tree</tt> with three trees, the "stage" -starts out at 1.</p> -<p>This means that you can do</p> +output after two-tree merge.</p></div> +<h3 id="_3_way_merge">3-Way Merge</h3><div style="clear:left"></div> +<div class="para"><p>Each "index" entry has two bits worth of "stage" state. stage 0 is the +normal one, and is the only one you'd see in any kind of normal use.</p></div> +<div class="para"><p>However, when you do <em>git-read-tree</em> with three trees, the "stage" +starts out at 1.</p></div> +<div class="para"><p>This means that you can do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git read-tree -m <tree1> <tree2> <tree3></tt></pre> </div></div> -<p>and you will end up with an index with all of the <tree1> entries in +<div class="para"><p>and you will end up with an index with all of the <tree1> entries in "stage1", all of the <tree2> entries in "stage2" and all of the <tree3> entries in "stage3". When performing a merge of another branch into the current branch, we use the common ancestor tree as <tree1>, the current branch head as <tree2>, and the other -branch head as <tree3>.</p> -<p>Furthermore, <tt>git-read-tree</tt> has special-case logic that says: if you see +branch head as <tree3>.</p></div> +<div class="para"><p>Furthermore, <em>git-read-tree</em> has special-case logic that says: if you see a file that matches in all respects in the following states, it -"collapses" back to "stage0":</p> -<ul> +"collapses" back to "stage0":</p></div> +<div class="ilist"><ul> <li> <p> stage 2 and 3 are the same; take one or the other (it makes no @@ -585,29 +633,29 @@ stage 2 (we did something while they did nothing) </p> </li> -</ul> -<p>The <tt>git-write-tree</tt> command refuses to write a nonsensical tree, and it +</ul></div> +<div class="para"><p>The <em>git-write-tree</em> command refuses to write a nonsensical tree, and it will complain about unmerged entries if it sees a single entry that is not -stage 0.</p> -<p>OK, this all sounds like a collection of totally nonsensical rules, +stage 0.</p></div> +<div class="para"><p>OK, this all sounds like a collection of totally nonsensical rules, but it's actually exactly what you want in order to do a fast merge. The different stages represent the "result tree" (stage 0, aka "merged"), the original tree (stage 1, aka "orig"), and the two trees -you are trying to merge (stage 2 and 3 respectively).</p> -<p>The order of stages 1, 2 and 3 (hence the order of three +you are trying to merge (stage 2 and 3 respectively).</p></div> +<div class="para"><p>The order of stages 1, 2 and 3 (hence the order of three <tree-ish> command line arguments) are significant when you start a 3-way merge with an index file that is already -populated. Here is an outline of how the algorithm works:</p> -<ul> +populated. Here is an outline of how the algorithm works:</p></div> +<div class="ilist"><ul> <li> <p> if a file exists in identical format in all three trees, it will - automatically collapse to "merged" state by <tt>git-read-tree</tt>. + automatically collapse to "merged" state by <em>git-read-tree</em>. </p> </li> <li> <p> -a file that has _any_ difference what-so-ever in the three trees +a file that has <em>any</em> difference what-so-ever in the three trees will stay as separate entries in the index. It's up to "porcelain policy" to determine how to remove the non-0 stages, and insert a merged version. @@ -620,7 +668,7 @@ stages 1/2/3 (i.e., "unmerged entries") you can't write the result. So now the merge algorithm ends up being really simple: </p> -<ul> +<div class="ilist"><ul> <li> <p> you walk the index in order, and ignore all entries of stage 0, @@ -642,41 +690,41 @@ trivial rules .. </p> </li> -</ul> +</ul></div> </li> -</ul> -<p>You would normally use <tt>git-merge-index</tt> with supplied -<tt>git-merge-one-file</tt> to do this last step. The script updates +</ul></div> +<div class="para"><p>You would normally use <em>git-merge-index</em> with supplied +<em>git-merge-one-file</em> to do this last step. The script updates the files in the working tree as it merges each path and at the -end of a successful merge.</p> -<p>When you start a 3-way merge with an index file that is already +end of a successful merge.</p></div> +<div class="para"><p>When you start a 3-way merge with an index file that is already populated, it is assumed that it represents the state of the files in your work tree, and you can even have files with changes unrecorded in the index file. It is further assumed that this state is "derived" from the stage 2 tree. The 3-way merge refuses to run if it finds an entry in the original index -file that does not match stage 2.</p> -<p>This is done to prevent you from losing your work-in-progress +file that does not match stage 2.</p></div> +<div class="para"><p>This is done to prevent you from losing your work-in-progress changes, and mixing your random changes in an unrelated merge commit. To illustrate, suppose you start from what has been -committed last to your repository:</p> +committed last to your repository:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ JC=`git rev-parse --verify "HEAD^0"` $ git checkout-index -f -u -a $JC</tt></pre> </div></div> -<p>You do random edits, without running <tt>git-update-index</tt>. And then +<div class="para"><p>You do random edits, without running <em>git-update-index</em>. And then you notice that the tip of your "upstream" tree has advanced -since you pulled from him:</p> +since you pulled from him:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git fetch git://.... linus $ LT=`cat .git/FETCH_HEAD`</tt></pre> </div></div> -<p>Your work tree is still based on your HEAD ($JC), but you have +<div class="para"><p>Your work tree is still based on your HEAD ($JC), but you have some edits since. Three-way merge makes sure that you have not added or modified index entries since $JC, and if you haven't, -then does the right thing. So with the following sequence:</p> +then does the right thing. So with the following sequence:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git read-tree -m -u `git merge-base $JC $LT` $JC $LT @@ -684,42 +732,42 @@ $ echo "Merge with Linus" | \ git commit-tree `git write-tree` -p $JC -p $LT</tt></pre> </div></div> -<p>what you would commit is a pure merge between $JC and $LT without +<div class="para"><p>what you would commit is a pure merge between $JC and $LT without your work-in-progress changes, and your work tree would be -updated to the result of the merge.</p> -<p>However, if you have local changes in the working tree that -would be overwritten by this merge, <tt>git-read-tree</tt> will refuse -to run to prevent your changes from being lost.</p> -<p>In other words, there is no need to worry about what exists only +updated to the result of the merge.</p></div> +<div class="para"><p>However, if you have local changes in the working tree that +would be overwritten by this merge, <em>git-read-tree</em> will refuse +to run to prevent your changes from being lost.</p></div> +<div class="para"><p>In other words, there is no need to worry about what exists only in the working tree. When you have local changes in a part of the project that is not involved in the merge, your changes do not interfere with the merge, and are kept intact. When they -<strong>do</strong> interfere, the merge does not even start (<tt>git-read-tree</tt> +<strong>do</strong> interfere, the merge does not even start (<em>git-read-tree</em> complains loudly and fails without modifying anything). In such a case, you can simply continue doing what you were in the middle of doing, and when your working tree is ready (i.e. you -have finished your work-in-progress), attempt the merge again.</p> +have finished your work-in-progress), attempt the merge again.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-write-tree.html">git-write-tree(1)</a>; <a href="git-ls-files.html">git-ls-files(1)</a>; -<a href="gitignore.html">gitignore(5)</a></p> +<div class="para"><p><a href="git-write-tree.html">git-write-tree(1)</a>; <a href="git-ls-files.html">git-ls-files(1)</a>; +<a href="gitignore.html">gitignore(5)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:57 UTC +Last updated 2008-07-06 05:16:57 UTC </div> </div> </body> diff --git a/git-read-tree.txt b/git-read-tree.txt index 0c7cc6b..6f4b9b0 100644 --- a/git-read-tree.txt +++ b/git-read-tree.txt
@@ -22,8 +22,8 @@ flag. When used with `-m`, the `-u` flag causes it to also update the files in the work tree with the result of the merge. -Trivial merges are done by `git-read-tree` itself. Only conflicting paths -will be in unmerged state when `git-read-tree` returns. +Trivial merges are done by 'git-read-tree' itself. Only conflicting paths +will be in unmerged state when 'git-read-tree' returns. OPTIONS ------- @@ -54,13 +54,13 @@ Show the progress of checking files out. --trivial:: - Restrict three-way merge by `git-read-tree` to happen + Restrict three-way merge by 'git-read-tree' to happen only if there is no file-level merging required, instead of resolving merge for trivial cases and leaving conflicting files unresolved in the index. --aggressive:: - Usually a three-way merge by `git-read-tree` resolves + Usually a three-way merge by 'git-read-tree' resolves the merge for really trivial cases and leaves other cases unresolved in the index, so that Porcelains can implement different merge policies. This flag makes the @@ -113,7 +113,7 @@ Merging ------- -If `-m` is specified, `git-read-tree` can perform 3 kinds of +If `-m` is specified, 'git-read-tree' can perform 3 kinds of merge, a single tree merge if only 1 tree is given, a fast-forward merge with 2 trees, or a 3-way merge if 3 trees are provided. @@ -121,18 +121,18 @@ Single Tree Merge ~~~~~~~~~~~~~~~~~ -If only 1 tree is specified, `git-read-tree` operates as if the user did not +If only 1 tree is specified, 'git-read-tree' operates as if the user did not specify `-m`, except that if the original index has an entry for a given pathname, and the contents of the path matches with the tree being read, the stat info from the index is used. (In other words, the index's stat()s take precedence over the merged tree's). That means that if you do a `git read-tree -m <newtree>` followed by a -`git checkout-index -f -u -a`, the `git-checkout-index` only checks out +`git checkout-index -f -u -a`, the 'git-checkout-index' only checks out the stuff that really changed. -This is used to avoid unnecessary false hits when `git-diff-files` is -run after `git-read-tree`. +This is used to avoid unnecessary false hits when 'git-diff-files' is +run after 'git-read-tree'. Two Tree Merge @@ -143,7 +143,7 @@ of a foreign tree, which is simply ahead of $H (i.e. we are in a fast forward situation). -When two trees are specified, the user is telling `git-read-tree` +When two trees are specified, the user is telling 'git-read-tree' the following: 1. The current index and work tree is derived from $H, but @@ -193,10 +193,10 @@ In all "keep index" cases, the index entry stays as in the original index file. If the entry were not up to date, -`git-read-tree` keeps the copy in the work tree intact when +'git-read-tree' keeps the copy in the work tree intact when operating under the -u flag. -When this form of `git-read-tree` returns successfully, you can +When this form of 'git-read-tree' returns successfully, you can see what "local changes" you made are carried forward by running `git diff-index --cached $M`. Note that this does not necessarily match `git diff-index --cached $H` would have @@ -213,7 +213,7 @@ Each "index" entry has two bits worth of "stage" state. stage 0 is the normal one, and is the only one you'd see in any kind of normal use. -However, when you do `git-read-tree` with three trees, the "stage" +However, when you do 'git-read-tree' with three trees, the "stage" starts out at 1. This means that you can do @@ -229,7 +229,7 @@ as <tree1>, the current branch head as <tree2>, and the other branch head as <tree3>. -Furthermore, `git-read-tree` has special-case logic that says: if you see +Furthermore, 'git-read-tree' has special-case logic that says: if you see a file that matches in all respects in the following states, it "collapses" back to "stage0": @@ -245,7 +245,7 @@ - stage 1 and stage 3 are the same and stage 2 is different take stage 2 (we did something while they did nothing) -The `git-write-tree` command refuses to write a nonsensical tree, and it +The 'git-write-tree' command refuses to write a nonsensical tree, and it will complain about unmerged entries if it sees a single entry that is not stage 0. @@ -261,7 +261,7 @@ populated. Here is an outline of how the algorithm works: - if a file exists in identical format in all three trees, it will - automatically collapse to "merged" state by `git-read-tree`. + automatically collapse to "merged" state by 'git-read-tree'. - a file that has _any_ difference what-so-ever in the three trees will stay as separate entries in the index. It's up to "porcelain @@ -285,8 +285,8 @@ matching "stage1" entry if it exists too. .. all the normal trivial rules .. -You would normally use `git-merge-index` with supplied -`git-merge-one-file` to do this last step. The script updates +You would normally use 'git-merge-index' with supplied +'git-merge-one-file' to do this last step. The script updates the files in the working tree as it merges each path and at the end of a successful merge. @@ -308,7 +308,7 @@ $ git checkout-index -f -u -a $JC ---------------- -You do random edits, without running `git-update-index`. And then +You do random edits, without running 'git-update-index'. And then you notice that the tip of your "upstream" tree has advanced since you pulled from him: @@ -334,14 +334,14 @@ updated to the result of the merge. However, if you have local changes in the working tree that -would be overwritten by this merge, `git-read-tree` will refuse +would be overwritten by this merge, 'git-read-tree' will refuse to run to prevent your changes from being lost. In other words, there is no need to worry about what exists only in the working tree. When you have local changes in a part of the project that is not involved in the merge, your changes do not interfere with the merge, and are kept intact. When they -*do* interfere, the merge does not even start (`git-read-tree` +*do* interfere, the merge does not even start ('git-read-tree' complains loudly and fails without modifying anything). In such a case, you can simply continue doing what you were in the middle of doing, and when your working tree is ready (i.e. you diff --git a/git-rebase.html b/git-rebase.html index 564948b..a2905d5 100644 --- a/git-rebase.html +++ b/git-rebase.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-rebase(1)</title> </head> @@ -279,74 +327,74 @@ [--onto <newbase>] <upstream> [<branch>] <em>git rebase</em> --continue | --skip | --abort</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>If <branch> is specified, <tt>git-rebase</tt> will perform an automatic +<div class="para"><p>If <branch> is specified, <em>git-rebase</em> will perform an automatic <tt>git checkout <branch></tt> before doing anything else. Otherwise -it remains on the current branch.</p> -<p>All changes made by commits in the current branch but that are not +it remains on the current branch.</p></div> +<div class="para"><p>All changes made by commits in the current branch but that are not in <upstream> are saved to a temporary area. This is the same set -of commits that would be shown by <tt>git log <upstream>..HEAD</tt>.</p> -<p>The current branch is reset to <upstream>, or <newbase> if the +of commits that would be shown by <tt>git log <upstream>..HEAD</tt>.</p></div> +<div class="para"><p>The current branch is reset to <upstream>, or <newbase> if the --onto option was supplied. This has the exact same effect as -<tt>git reset --hard <upstream></tt> (or <newbase>).</p> -<p>The commits that were previously saved into the temporary area are +<tt>git reset --hard <upstream></tt> (or <newbase>).</p></div> +<div class="para"><p>The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in HEAD which introduce the same textual changes as a commit in HEAD..<upstream> are omitted (i.e., a patch already accepted upstream -with a different commit message or timestamp will be skipped).</p> -<p>It is possible that a merge failure will prevent this process from being +with a different commit message or timestamp will be skipped).</p></div> +<div class="para"><p>It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run <tt>git rebase --continue</tt>. Another option is to bypass the commit that caused the merge failure with <tt>git rebase --skip</tt>. To restore the original <branch> and remove the .dotest working files, use the command -<tt>git rebase --abort</tt> instead.</p> -<p>Assume the following history exists and the current branch is "topic":</p> +<tt>git rebase --abort</tt> instead.</p></div> +<div class="para"><p>Assume the following history exists and the current branch is "topic":</p></div> <div class="listingblock"> <div class="content"> <pre><tt> A---B---C topic / D---E---F---G master</tt></pre> </div></div> -<p>From this point, the result of either of the following commands:</p> +<div class="para"><p>From this point, the result of either of the following commands:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git rebase master git rebase master topic</tt></pre> </div></div> -<p>would be:</p> +<div class="para"><p>would be:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> A'--B'--C' topic / D---E---F---G master</tt></pre> </div></div> -<p>The latter form is just a short-hand of <tt>git checkout topic</tt> -followed by <tt>git rebase master</tt>.</p> -<p>If the upstream branch already contains a change you have made (e.g., +<div class="para"><p>The latter form is just a short-hand of <tt>git checkout topic</tt> +followed by <tt>git rebase master</tt>.</p></div> +<div class="para"><p>If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit will be skipped. For example, running <tt>git rebase master</tt> on the following history (in which A' and A introduce the same set of changes, -but have different committer information):</p> +but have different committer information):</p></div> <div class="listingblock"> <div class="content"> <pre><tt> A---B---C topic / D---E---A'---F master</tt></pre> </div></div> -<p>will result in:</p> +<div class="para"><p>will result in:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> B'---C' topic / D---E---A'---F master</tt></pre> </div></div> -<p>Here is how you would transplant a topic branch based on one +<div class="para"><p>Here is how you would transplant a topic branch based on one branch to another, to pretend that you forked the topic branch -from the latter branch, using <tt>rebase --onto</tt>.</p> -<p>First let's assume your <em>topic</em> is based on branch <em>next</em>. +from the latter branch, using <tt>rebase --onto</tt>.</p></div> +<div class="para"><p>First let's assume your <em>topic</em> is based on branch <em>next</em>. For example feature developed in <em>topic</em> depends on some -functionality which is found in <em>next</em>.</p> +functionality which is found in <em>next</em>.</p></div> <div class="listingblock"> <div class="content"> <pre><tt> o---o---o---o---o master @@ -355,9 +403,9 @@ \ o---o---o topic</tt></pre> </div></div> -<p>We would want to make <em>topic</em> forked from branch <em>master</em>, +<div class="para"><p>We would want to make <em>topic</em> forked from branch <em>master</em>, for example because the functionality <em>topic</em> branch depend on -got merged into more stable <em>master</em> branch, like this:</p> +got merged into more stable <em>master</em> branch, like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> o---o---o---o---o master @@ -366,13 +414,13 @@ \ o---o---o---o---o next</tt></pre> </div></div> -<p>We can get this using the following command:</p> +<div class="para"><p>We can get this using the following command:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git rebase --onto master next topic</tt></pre> </div></div> -<p>Another example of --onto option is to rebase part of a -branch. If we have the following situation:</p> +<div class="para"><p>Another example of --onto option is to rebase part of a +branch. If we have the following situation:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> H---I---J topicB @@ -381,12 +429,12 @@ / A---B---C---D master</tt></pre> </div></div> -<p>then the command</p> +<div class="para"><p>then the command</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git rebase --onto master topicA topicB</tt></pre> </div></div> -<p>would result in:</p> +<div class="para"><p>would result in:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> H'--I'--J' topicB @@ -395,50 +443,50 @@ |/ A---B---C---D master</tt></pre> </div></div> -<p>This is useful when topicB does not depend on topicA.</p> -<p>A range of commits could also be removed with rebase. If we have -the following situation:</p> +<div class="para"><p>This is useful when topicB does not depend on topicA.</p></div> +<div class="para"><p>A range of commits could also be removed with rebase. If we have +the following situation:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> E---F---G---H---I---J topicA</tt></pre> </div></div> -<p>then the command</p> +<div class="para"><p>then the command</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git rebase --onto topicA~5 topicA~3 topicA</tt></pre> </div></div> -<p>would result in the removal of commits F and G:</p> +<div class="para"><p>would result in the removal of commits F and G:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> E---H'---I'---J' topicA</tt></pre> </div></div> -<p>This is useful if F and G were flawed in some way, or should not be +<div class="para"><p>This is useful if F and G were flawed in some way, or should not be part of topicA. Note that the argument to --onto and the <upstream> -parameter can be any valid commit-ish.</p> -<p>In case of conflict, <tt>git-rebase</tt> will stop at the first problematic commit -and leave conflict markers in the tree. You can use <tt>git-diff</tt> to locate +parameter can be any valid commit-ish.</p></div> +<div class="para"><p>In case of conflict, <em>git-rebase</em> will stop at the first problematic commit +and leave conflict markers in the tree. You can use <em>git-diff</em> to locate the markers (<<<<<<) and make edits to resolve the conflict. For each file you edit, you need to tell git that the conflict has been resolved, -typically this would be done with</p> +typically this would be done with</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git add <filename></tt></pre> </div></div> -<p>After resolving the conflict manually and updating the index with the -desired resolution, you can continue the rebasing process with</p> +<div class="para"><p>After resolving the conflict manually and updating the index with the +desired resolution, you can continue the rebasing process with</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git rebase --continue</tt></pre> </div></div> -<p>Alternatively, you can undo the <tt>git-rebase</tt> with</p> +<div class="para"><p>Alternatively, you can undo the <em>git-rebase</em> with</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git rebase --abort</tt></pre> </div></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <newbase> </dt> @@ -515,8 +563,8 @@ Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no <tt>-s</tt> option, a built-in list of strategies - is used instead (<tt>git-merge-recursive</tt> when merging a single - head, <tt>git-merge-octopus</tt> otherwise). This implies --merge. + is used instead (<em>git-merge-recursive</em> when merging a single + head, <em>git-merge-octopus</em> otherwise). This implies --merge. </p> </dd> <dt> @@ -546,7 +594,7 @@ </dt> <dd> <p> - This flag is passed to the <tt>git-apply</tt> program + This flag is passed to the <em>git-apply</em> program (see <a href="git-apply.html">git-apply(1)</a>) that applies the patch. </p> </dd> @@ -575,11 +623,11 @@ only works in interactive mode. </p> </dd> -</dl> +</dl></div> </div> -<h2>MERGE STRATEGIES</h2> +<h2 id="_merge_strategies">MERGE STRATEGIES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> resolve </dt> @@ -645,28 +693,28 @@ ancestor tree. </p> </dd> -</dl> +</dl></div> </div> -<h2>NOTES</h2> +<h2 id="_notes">NOTES</h2> <div class="sectionbody"> -<p>When you rebase a branch, you are changing its history in a way that +<div class="para"><p>When you rebase a branch, you are changing its history in a way that will cause problems for anyone who already has a copy of the branch in their repository and tries to pull updates from you. You should -understand the implications of using <em>git rebase</em> on a repository that -you share.</p> -<p>When the git rebase command is run, it will first execute a "pre-rebase" +understand the implications of using <em>git-rebase</em> on a repository that +you share.</p></div> +<div class="para"><p>When the git-rebase command is run, it will first execute a "pre-rebase" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template -pre-rebase hook script for an example.</p> -<p>Upon completion, <branch> will be the current branch.</p> +pre-rebase hook script for an example.</p></div> +<div class="para"><p>Upon completion, <branch> will be the current branch.</p></div> </div> -<h2>INTERACTIVE MODE</h2> +<h2 id="_interactive_mode">INTERACTIVE MODE</h2> <div class="sectionbody"> -<p>Rebasing interactively means that you have a chance to edit the commits +<div class="para"><p>Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can -remove them (weeding out bad or otherwise unwanted patches).</p> -<p>The interactive mode is meant for this type of workflow:</p> -<ol> +remove them (weeding out bad or otherwise unwanted patches).</p></div> +<div class="para"><p>The interactive mode is meant for this type of workflow:</p></div> +<div class="olist"><ol> <li> <p> have a wonderful idea @@ -687,14 +735,14 @@ submit </p> </li> -</ol> -<p>where point 2. consists of several instances of</p> -<ol class="olist2"> +</ol></div> +<div class="para"><p>where point 2. consists of several instances of</p></div> +<div class="olist2"><ol> <li> <p> regular use </p> -<ol> +<div class="olist"><ol> <li> <p> finish something worthy of a commit @@ -705,13 +753,13 @@ commit </p> </li> -</ol> +</ol></div> </li> <li> <p> independent fixup </p> -<ol> +<div class="olist"><ol> <li> <p> realize that something does not work @@ -727,52 +775,52 @@ commit it </p> </li> -</ol> +</ol></div> </li> -</ol> -<p>Sometimes the thing fixed in b.2. cannot be amended to the not-quite +</ol></div> +<div class="para"><p>Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of "a"s and "b"s, by rearranging and editing -commits, and squashing multiple commits into one.</p> -<p>Start it with the last commit you want to retain as-is:</p> +commits, and squashing multiple commits into one.</p></div> +<div class="para"><p>Start it with the last commit you want to retain as-is:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git rebase -i <after-this-commit></tt></pre> </div></div> -<p>An editor will be fired up with all the commits in your current branch +<div class="para"><p>An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can -remove them. The list looks more or less like this:</p> +remove them. The list looks more or less like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>pick deadbee The oneline of this commit pick fa1afe1 The oneline of the next commit ...</tt></pre> </div></div> -<p>The oneline descriptions are purely for your pleasure; <tt>git-rebase</tt> will +<div class="para"><p>The oneline descriptions are purely for your pleasure; <em>git-rebase</em> will not look at them but at the commit names ("deadbee" and "fa1afe1" in this -example), so do not delete or edit the names.</p> -<p>By replacing the command "pick" with the command "edit", you can tell -<tt>git-rebase</tt> to stop after applying that commit, so that you can edit +example), so do not delete or edit the names.</p></div> +<div class="para"><p>By replacing the command "pick" with the command "edit", you can tell +<em>git-rebase</em> to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue -rebasing.</p> -<p>If you want to fold two or more commits into one, replace the command +rebasing.</p></div> +<div class="para"><p>If you want to fold two or more commits into one, replace the command "pick" with "squash" for the second and subsequent commit. If the commits had different authors, it will attribute the squashed commit to -the author of the first commit.</p> -<p>In both cases, or when a "pick" does not succeed (because of merge +the author of the first commit.</p></div> +<div class="para"><p>In both cases, or when a "pick" does not succeed (because of merge errors), the loop will stop to let you fix things, and you can continue -the loop with <tt>git rebase --continue</tt>.</p> -<p>For example, if you want to reorder the last 5 commits, such that what +the loop with <tt>git rebase --continue</tt>.</p></div> +<div class="para"><p>For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call -<tt>git-rebase</tt> like this:</p> +<em>git-rebase</em> like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git rebase -i HEAD~5</tt></pre> </div></div> -<p>And move the first patch to the end of the list.</p> -<p>You might want to preserve merges, if you have a history like this:</p> +<div class="para"><p>And move the first patch to the end of the list.</p></div> +<div class="para"><p>You might want to preserve merges, if you have a history like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> X @@ -781,20 +829,20 @@ / ---o---O---P---Q</tt></pre> </div></div> -<p>Suppose you want to rebase the side branch starting at "A" to "Q". Make -sure that the current HEAD is "B", and call</p> +<div class="para"><p>Suppose you want to rebase the side branch starting at "A" to "Q". Make +sure that the current HEAD is "B", and call</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git rebase -i -p --onto Q O</tt></pre> </div></div> </div> -<h2>SPLITTING COMMITS</h2> +<h2 id="_splitting_commits">SPLITTING COMMITS</h2> <div class="sectionbody"> -<p>In interactive mode, you can mark commits with the action "edit". However, -this does not necessarily mean that <tt>git-rebase</tt> expects the result of this +<div class="para"><p>In interactive mode, you can mark commits with the action "edit". However, +this does not necessarily mean that <em>git-rebase</em> expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can -add other commits. This can be used to split a commit into two:</p> -<ul> +add other commits. This can be used to split a commit into two:</p></div> +<div class="ilist"><ul> <li> <p> Start an interactive rebase with <tt>git rebase -i <commit>^</tt>, where @@ -818,7 +866,7 @@ <p> Now add the changes to the index that you want to have in the first commit. You can use <tt>git add</tt> (possibly interactively) or - <tt>git-gui</tt> (or both) to do that. + <em>git-gui</em> (or both) to do that. </p> </li> <li> @@ -837,28 +885,28 @@ Continue the rebase with <tt>git rebase --continue</tt>. </p> </li> -</ul> -<p>If you are not absolutely sure that the intermediate revisions are +</ul></div> +<div class="para"><p>If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use -<tt>git-stash</tt> to stash away the not-yet-committed changes -after each commit, test, and amend the commit if fixes are necessary.</p> +<em>git-stash</em> to stash away the not-yet-committed changes +after each commit, test, and amend the commit if fixes are necessary.</p></div> </div> -<h2>Authors</h2> +<h2 id="_authors">Authors</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net> and -Johannes E. Schindelin <johannes.schindelin@gmx.de></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net> and +Johannes E. Schindelin <johannes.schindelin@gmx.de></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:57 UTC +Last updated 2008-07-06 05:16:57 UTC </div> </div> </body> diff --git a/git-rebase.txt b/git-rebase.txt index 754230e..f3459c7 100644 --- a/git-rebase.txt +++ b/git-rebase.txt
@@ -16,7 +16,7 @@ DESCRIPTION ----------- -If <branch> is specified, `git-rebase` will perform an automatic +If <branch> is specified, 'git-rebase' will perform an automatic `git checkout <branch>` before doing anything else. Otherwise it remains on the current branch. @@ -167,8 +167,8 @@ part of topicA. Note that the argument to --onto and the <upstream> parameter can be any valid commit-ish. -In case of conflict, `git-rebase` will stop at the first problematic commit -and leave conflict markers in the tree. You can use `git-diff` to locate +In case of conflict, 'git-rebase' will stop at the first problematic commit +and leave conflict markers in the tree. You can use 'git-diff' to locate the markers (<<<<<<) and make edits to resolve the conflict. For each file you edit, you need to tell git that the conflict has been resolved, typically this would be done with @@ -184,7 +184,7 @@ git rebase --continue -Alternatively, you can undo the `git-rebase` with +Alternatively, you can undo the 'git-rebase' with git rebase --abort @@ -224,8 +224,8 @@ Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies - is used instead (`git-merge-recursive` when merging a single - head, `git-merge-octopus` otherwise). This implies --merge. + is used instead ('git-merge-recursive' when merging a single + head, 'git-merge-octopus' otherwise). This implies --merge. -v:: --verbose:: @@ -238,7 +238,7 @@ ever ignored. --whitespace=<nowarn|warn|error|error-all|strip>:: - This flag is passed to the `git-apply` program + This flag is passed to the 'git-apply' program (see linkgit:git-apply[1]) that applies the patch. -i:: @@ -259,10 +259,10 @@ When you rebase a branch, you are changing its history in a way that will cause problems for anyone who already has a copy of the branch in their repository and tries to pull updates from you. You should -understand the implications of using 'git rebase' on a repository that +understand the implications of using 'git-rebase' on a repository that you share. -When the git rebase command is run, it will first execute a "pre-rebase" +When the git-rebase command is run, it will first execute a "pre-rebase" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example. @@ -314,12 +314,12 @@ ... ------------------------------------------- -The oneline descriptions are purely for your pleasure; `git-rebase` will +The oneline descriptions are purely for your pleasure; 'git-rebase' will not look at them but at the commit names ("deadbee" and "fa1afe1" in this example), so do not delete or edit the names. By replacing the command "pick" with the command "edit", you can tell -`git-rebase` to stop after applying that commit, so that you can edit +'git-rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing. @@ -334,7 +334,7 @@ For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call -`git-rebase` like this: +'git-rebase' like this: ---------------------- $ git rebase -i HEAD~5 @@ -364,7 +364,7 @@ ----------------- In interactive mode, you can mark commits with the action "edit". However, -this does not necessarily mean that `git-rebase` expects the result of this +this does not necessarily mean that 'git-rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two: @@ -380,7 +380,7 @@ - Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or - `git-gui` (or both) to do that. + 'git-gui' (or both) to do that. - Commit the now-current index with whatever commit message is appropriate now. @@ -391,7 +391,7 @@ If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use -`git-stash` to stash away the not-yet-committed changes +'git-stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary. diff --git a/git-receive-pack.html b/git-receive-pack.html index d5ea89b..d4c5cfb 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-receive-pack(1)</title> </head> @@ -272,29 +320,29 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git receive-pack</em> <directory></p> +<div class="para"><p><em>git receive-pack</em> <directory></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Invoked by <tt>git-send-pack</tt> and updates the repository with the -information fed from the remote end.</p> -<p>This command is usually not invoked directly by the end user. -The UI for the protocol is on the <tt>git-send-pack</tt> side, and the +<div class="para"><p>Invoked by <em>git-send-pack</em> and updates the repository with the +information fed from the remote end.</p></div> +<div class="para"><p>This command is usually not invoked directly by the end user. +The UI for the protocol is on the <em>git-send-pack</em> side, and the program pair is meant to be used to push updates to remote -repository. For pull operations, see <a href="git-fetch-pack.html">git-fetch-pack(1)</a>.</p> -<p>The command allows for creation and fast forwarding of sha1 refs +repository. For pull operations, see <a href="git-fetch-pack.html">git-fetch-pack(1)</a>.</p></div> +<div class="para"><p>The command allows for creation and fast forwarding of sha1 refs (heads/tags) on the remote end (strictly speaking, it is the -local end <tt>git-receive-pack</tt> runs, but to the user who is sitting at -the send-pack end, it is updating the remote. Confused?)</p> -<p>There are other real-world examples of using update and -post-update hooks found in the Documentation/howto directory.</p> -<p><tt>git-receive-pack</tt> honours the receive.denyNonFastForwards config +local end <em>git-receive-pack</em> runs, but to the user who is sitting at +the send-pack end, it is updating the remote. Confused?)</p></div> +<div class="para"><p>There are other real-world examples of using update and +post-update hooks found in the Documentation/howto directory.</p></div> +<div class="para"><p><em>git-receive-pack</em> honours the receive.denyNonFastForwards config option, which tells it if updates to a ref should be denied if they -are not fast-forwards.</p> +are not fast-forwards.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <directory> </dt> @@ -303,72 +351,72 @@ The repository to sync into. </p> </dd> -</dl> +</dl></div> </div> -<h2>pre-receive Hook</h2> +<h2 id="_pre_receive_hook">pre-receive Hook</h2> <div class="sectionbody"> -<p>Before any ref is updated, if $GIT_DIR/hooks/pre-receive file exists +<div class="para"><p>Before any ref is updated, if $GIT_DIR/hooks/pre-receive file exists and is executable, it will be invoked once with no parameters. The -standard input of the hook will be one line per ref to be updated:</p> +standard input of the hook will be one line per ref to be updated:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>sha1-old SP sha1-new SP refname LF</tt></pre> </div></div> -<p>The refname value is relative to $GIT_DIR; e.g. for the master +<div class="para"><p>The refname value is relative to $GIT_DIR; e.g. for the master head this is "refs/heads/master". The two sha1 values before each refname are the object names for the refname before and after the update. Refs to be created will have sha1-old equal to 0{40}, while refs to be deleted will have sha1-new equal to 0{40}, otherwise -sha1-old and sha1-new should be valid objects in the repository.</p> -<p>This hook is called before any refname is updated and before any -fast-forward checks are performed.</p> -<p>If the pre-receive hook exits with a non-zero exit status no updates +sha1-old and sha1-new should be valid objects in the repository.</p></div> +<div class="para"><p>This hook is called before any refname is updated and before any +fast-forward checks are performed.</p></div> +<div class="para"><p>If the pre-receive hook exits with a non-zero exit status no updates will be performed, and the update, post-receive and post-update hooks will not be invoked either. This can be useful to quickly -bail out if the update is not to be supported.</p> +bail out if the update is not to be supported.</p></div> </div> -<h2>update Hook</h2> +<h2 id="_update_hook">update Hook</h2> <div class="sectionbody"> -<p>Before each ref is updated, if $GIT_DIR/hooks/update file exists -and is executable, it is invoked once per ref, with three parameters:</p> +<div class="para"><p>Before each ref is updated, if $GIT_DIR/hooks/update file exists +and is executable, it is invoked once per ref, with three parameters:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>$GIT_DIR/hooks/update refname sha1-old sha1-new</tt></pre> </div></div> -<p>The refname parameter is relative to $GIT_DIR; e.g. for the master +<div class="para"><p>The refname parameter is relative to $GIT_DIR; e.g. for the master head this is "refs/heads/master". The two sha1 arguments are the object names for the refname before and after the update. Note that the hook is called before the refname is updated, so either sha1-old is 0{40} (meaning there is no such ref yet), -or it should match what is recorded in refname.</p> -<p>The hook should exit with non-zero status if it wants to disallow -updating the named ref. Otherwise it should exit with zero.</p> -<p>Successful execution (a zero exit status) of this hook does not +or it should match what is recorded in refname.</p></div> +<div class="para"><p>The hook should exit with non-zero status if it wants to disallow +updating the named ref. Otherwise it should exit with zero.</p></div> +<div class="para"><p>Successful execution (a zero exit status) of this hook does not ensure the ref will actually be updated, it is only a prerequisite. As such it is not a good idea to send notices (e.g. email) from -this hook. Consider using the post-receive hook instead.</p> +this hook. Consider using the post-receive hook instead.</p></div> </div> -<h2>post-receive Hook</h2> +<h2 id="_post_receive_hook">post-receive Hook</h2> <div class="sectionbody"> -<p>After all refs were updated (or attempted to be updated), if any +<div class="para"><p>After all refs were updated (or attempted to be updated), if any ref update was successful, and if $GIT_DIR/hooks/post-receive file exists and is executable, it will be invoke once with no parameters. The standard input of the hook will be one line -for each successfully updated ref:</p> +for each successfully updated ref:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>sha1-old SP sha1-new SP refname LF</tt></pre> </div></div> -<p>The refname value is relative to $GIT_DIR; e.g. for the master +<div class="para"><p>The refname value is relative to $GIT_DIR; e.g. for the master head this is "refs/heads/master". The two sha1 values before each refname are the object names for the refname before and after the update. Refs that were created will have sha1-old equal to 0{40}, while refs that were deleted will have sha1-new equal to 0{40}, otherwise sha1-old and sha1-new should be valid objects in -the repository.</p> -<p>Using this hook, it is easy to generate mails describing the updates +the repository.</p></div> +<div class="para"><p>Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per -ref listing the commits pushed to the repository:</p> +ref listing the commits pushed to the repository:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>#!/bin/sh @@ -387,50 +435,50 @@ done exit 0</tt></pre> </div></div> -<p>The exit code from this hook invocation is ignored, however a -non-zero exit code will generate an error message.</p> -<p>Note that it is possible for refname to not have sha1-new when this +<div class="para"><p>The exit code from this hook invocation is ignored, however a +non-zero exit code will generate an error message.</p></div> +<div class="para"><p>Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref -after it was updated by <tt>git-receive-pack</tt>, but before the hook was able +after it was updated by <em>git-receive-pack</em>, but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new -rather than the current value of refname.</p> +rather than the current value of refname.</p></div> </div> -<h2>post-update Hook</h2> +<h2 id="_post_update_hook">post-update Hook</h2> <div class="sectionbody"> -<p>After all other processing, if at least one ref was updated, and +<div class="para"><p>After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will called with the list of refs that have been updated. -This can be used to implement any repository wide cleanup tasks.</p> -<p>The exit code from this hook invocation is ignored; the only thing -left for <tt>git-receive-pack</tt> to do at that point is to exit itself -anyway.</p> -<p>This hook can be used, for example, to run <tt>git update-server-info</tt> -if the repository is packed and is served via a dumb transport.</p> +This can be used to implement any repository wide cleanup tasks.</p></div> +<div class="para"><p>The exit code from this hook invocation is ignored; the only thing +left for <em>git-receive-pack</em> to do at that point is to exit itself +anyway.</p></div> +<div class="para"><p>This hook can be used, for example, to run <tt>git update-server-info</tt> +if the repository is packed and is served via a dumb transport.</p></div> <div class="literalblock"> <div class="content"> <pre><tt>#!/bin/sh exec git update-server-info</tt></pre> </div></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-send-pack.html">git-send-pack(1)</a></p> +<div class="para"><p><a href="git-send-pack.html">git-send-pack(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano.</p> +<div class="para"><p>Documentation by Junio C Hamano.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:58 UTC +Last updated 2008-07-06 05:16:58 UTC </div> </div> </body> diff --git a/git-receive-pack.txt b/git-receive-pack.txt index 207684d..6b2f8c4 100644 --- a/git-receive-pack.txt +++ b/git-receive-pack.txt
@@ -12,23 +12,23 @@ DESCRIPTION ----------- -Invoked by `git-send-pack` and updates the repository with the +Invoked by 'git-send-pack' and updates the repository with the information fed from the remote end. This command is usually not invoked directly by the end user. -The UI for the protocol is on the `git-send-pack` side, and the +The UI for the protocol is on the 'git-send-pack' side, and the program pair is meant to be used to push updates to remote repository. For pull operations, see linkgit:git-fetch-pack[1]. The command allows for creation and fast forwarding of sha1 refs (heads/tags) on the remote end (strictly speaking, it is the -local end `git-receive-pack` runs, but to the user who is sitting at +local end 'git-receive-pack' runs, but to the user who is sitting at the send-pack end, it is updating the remote. Confused?) There are other real-world examples of using update and post-update hooks found in the Documentation/howto directory. -`git-receive-pack` honours the receive.denyNonFastForwards config +'git-receive-pack' honours the receive.denyNonFastForwards config option, which tells it if updates to a ref should be denied if they are not fast-forwards. @@ -125,7 +125,7 @@ Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref -after it was updated by `git-receive-pack`, but before the hook was able +after it was updated by 'git-receive-pack', but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new rather than the current value of refname. @@ -137,7 +137,7 @@ This can be used to implement any repository wide cleanup tasks. The exit code from this hook invocation is ignored; the only thing -left for `git-receive-pack` to do at that point is to exit itself +left for 'git-receive-pack' to do at that point is to exit itself anyway. This hook can be used, for example, to run `git update-server-info`
diff --git a/git-reflog.html b/git-reflog.html index 8fb049c..745b569 100644 --- a/git-reflog.html +++ b/git-reflog.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-reflog(1)</title> </head> @@ -272,41 +320,43 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git reflog</em> <subcommand> <options></p> +<div class="para"><p><em>git reflog</em> <subcommand> <options></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>The command takes various subcommands, and different options -depending on the subcommand:</p> +<div class="para"><p>The command takes various subcommands, and different options +depending on the subcommand:</p></div> <div class="verseblock"> -<div class="content">git reflog expire [--dry-run] [--stale-fix] [--verbose] +<div class="content"><em>git reflog expire</em> [--dry-run] [--stale-fix] [--verbose] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>…</div></div> -<p>git reflog delete ref@{specifier}…</p> -<p>git reflog [show] [log-options] [<ref>]</p> -<p>Reflog is a mechanism to record when the tip of branches are -updated. This command is to manage the information recorded in it.</p> -<p>The subcommand "expire" is used to prune older reflog entries. +<div class="para"><p>+ +<em>git reflog delete</em> ref@{specifier}…</p></div> +<div class="para"><p>+ +<em>git reflog</em> [<em>show</em>] [log-options] [<ref>]</p></div> +<div class="para"><p>Reflog is a mechanism to record when the tip of branches are +updated. This command is to manage the information recorded in it.</p></div> +<div class="para"><p>The subcommand "expire" is used to prune older reflog entries. Entries older than <tt>expire</tt> time, or entries older than <tt>expire-unreachable</tt> time and are not reachable from the current tip, are removed from the reflog. This is typically not used -directly by the end users — instead, see <a href="git-gc.html">git-gc(1)</a>.</p> -<p>The subcommand "show" (which is also the default, in the absence of any +directly by the end users — instead, see <a href="git-gc.html">git-gc(1)</a>.</p></div> +<div class="para"><p>The subcommand "show" (which is also the default, in the absence of any subcommands) will take all the normal log options, and show the log of the reference provided in the command-line (or <tt>HEAD</tt>, by default). The reflog will cover all recent actions (HEAD reflog records branch switching -as well). It is an alias for <em>git log -g --abbrev-commit --pretty=oneline</em>; -see <a href="git-log.html">git-log(1)</a>.</p> -<p>The reflog is useful in various git commands, to specify the old value +as well). It is an alias for <tt>git log -g --abbrev-commit --pretty=oneline</tt>; +see <a href="git-log.html">git-log(1)</a>.</p></div> +<div class="para"><p>The reflog is useful in various git commands, to specify the old value of a reference. For example, <tt>HEAD@{2}</tt> means "where HEAD used to be two moves ago", <tt>master@{one.week.ago}</tt> means "where master used to point to one week ago", and so on. See <a href="git-rev-parse.html">git-rev-parse(1)</a> for -more details.</p> -<p>To delete single entries from the reflog, use the subcommand "delete" -and specify the _exact_ entry (e.g. “git reflog delete master@{2}”).</p> +more details.</p></div> +<div class="para"><p>To delete single entries from the reflog, use the subcommand "delete" +and specify the <em>exact</em> entry (e.g. "<tt>git reflog delete master@{2}</tt>").</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --stale-fix </dt> @@ -318,11 +368,11 @@ objects reachable from it that is not reachable from any of the refs. </p> -<p>This computation involves traversing all the reachable objects, i.e. it -has the same cost as <em>git prune</em>. Fortunately, once this is run, we +<div class="para"><p>This computation involves traversing all the reachable objects, i.e. it +has the same cost as <em>git-prune</em>. Fortunately, once this is run, we should not have to ever worry about missing objects, because the current prune and pack-objects know about reflogs and protect objects referred by -them.</p> +them.</p></div> </dd> <dt> --expire=<time> @@ -381,23 +431,23 @@ Print extra information on screen. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:58 UTC +Last updated 2008-07-06 05:16:58 UTC </div> </div> </body> diff --git a/git-reflog.txt b/git-reflog.txt index 8492aea..146d7f5 100644 --- a/git-reflog.txt +++ b/git-reflog.txt
@@ -16,12 +16,12 @@ depending on the subcommand: [verse] -git reflog expire [--dry-run] [--stale-fix] [--verbose] +'git reflog expire' [--dry-run] [--stale-fix] [--verbose] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>... - -git reflog delete ref@\{specifier\}... - -git reflog [show] [log-options] [<ref>] ++ +'git reflog delete' ref@\{specifier\}... ++ +'git reflog' ['show'] [log-options] [<ref>] Reflog is a mechanism to record when the tip of branches are updated. This command is to manage the information recorded in it. @@ -36,7 +36,7 @@ subcommands) will take all the normal log options, and show the log of the reference provided in the command-line (or `HEAD`, by default). The reflog will cover all recent actions (HEAD reflog records branch switching -as well). It is an alias for 'git log -g --abbrev-commit --pretty=oneline'; +as well). It is an alias for `git log -g --abbrev-commit --pretty=oneline`; see linkgit:git-log[1]. The reflog is useful in various git commands, to specify the old value @@ -46,7 +46,7 @@ more details. To delete single entries from the reflog, use the subcommand "delete" -and specify the _exact_ entry (e.g. ``git reflog delete master@\{2\}''). +and specify the _exact_ entry (e.g. "`git reflog delete master@\{2\}`"). OPTIONS @@ -60,7 +60,7 @@ refs. + This computation involves traversing all the reachable objects, i.e. it -has the same cost as 'git prune'. Fortunately, once this is run, we +has the same cost as 'git-prune'. Fortunately, once this is run, we should not have to ever worry about missing objects, because the current prune and pack-objects know about reflogs and protect objects referred by them. diff --git a/git-remote.html b/git-remote.html index d187901..49f56d1 100644 --- a/git-remote.html +++ b/git-remote.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-remote(1)</title> </head> @@ -274,19 +322,19 @@ <div class="sectionbody"> <div class="verseblock"> <div class="content"><em>git remote</em> [-v | --verbose] -<em>git remote</em> add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url> -<em>git remote</em> rm <name> -<em>git remote</em> show [-n] <name> -<em>git remote</em> prune [-n | --dry-run] <name> -<em>git remote</em> update [group]</div></div> +<em>git remote add</em> [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url> +<em>git remote rm</em> <name> +<em>git remote show</em> [-n] <name> +<em>git remote prune</em> [-n | --dry-run] <name> +<em>git remote update</em> [group]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Manage the set of repositories ("remotes") whose branches you track.</p> +<div class="para"><p>Manage the set of repositories ("remotes") whose branches you track.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -v </dt> @@ -298,13 +346,13 @@ Be a little more verbose and show remote url after name. </p> </dd> -</dl> +</dl></div> </div> -<h2>COMMANDS</h2> +<h2 id="_commands">COMMANDS</h2> <div class="sectionbody"> -<p>With no arguments, shows a list of existing remotes. Several -subcommands are available to perform operations on the remotes.</p> -<dl> +<div class="para"><p>With no arguments, shows a list of existing remotes. Several +subcommands are available to perform operations on the remotes.</p></div> +<div class="vlist"><dl> <dt> <em>add</em> </dt> @@ -314,21 +362,21 @@ <url>. The command <tt>git fetch <name></tt> can then be used to create and update remote-tracking branches <name>/<branch>. </p> -<p>With <tt>-f</tt> option, <tt>git fetch <name></tt> is run immediately after -the remote information is set up.</p> -<p>With <tt>-t <branch></tt> option, instead of the default glob +<div class="para"><p>With <tt>-f</tt> option, <tt>git fetch <name></tt> is run immediately after +the remote information is set up.</p></div> +<div class="para"><p>With <tt>-t <branch></tt> option, instead of the default glob refspec for the remote to track all branches under <tt>$GIT_DIR/remotes/<name>/</tt>, a refspec to track only <tt><branch></tt> is created. You can give more than one <tt>-t <branch></tt> to track -multiple branches without grabbing all branches.</p> -<p>With <tt>-m <master></tt> option, <tt>$GIT_DIR/remotes/<name>/HEAD</tt> is set +multiple branches without grabbing all branches.</p></div> +<div class="para"><p>With <tt>-m <master></tt> option, <tt>$GIT_DIR/remotes/<name>/HEAD</tt> is set up to point at remote's <tt><master></tt> branch instead of whatever -branch the <tt>HEAD</tt> at the remote repository actually points at.</p> -<p>In mirror mode, enabled with <tt>--mirror</tt>, the refs will not be stored +branch the <tt>HEAD</tt> at the remote repository actually points at.</p></div> +<div class="para"><p>In mirror mode, enabled with <tt>--mirror</tt>, the refs will not be stored in the <em>refs/remotes/</em> namespace, but in <em>refs/heads/</em>. This option only makes sense in bare repositories. If a remote uses mirror mode, furthermore, <tt>git push</tt> will always behave as if <tt>--mirror</tt> -was passed.</p> +was passed.</p></div> </dd> <dt> <em>rm</em> @@ -346,8 +394,8 @@ <p> Gives some information about the remote <name>. </p> -<p>With <tt>-n</tt> option, the remote heads are not queried first with -<tt>git ls-remote <name></tt>; cached information is used instead.</p> +<div class="para"><p>With <tt>-n</tt> option, the remote heads are not queried first with +<tt>git ls-remote <name></tt>; cached information is used instead.</p></div> </dd> <dt> <em>prune</em> @@ -359,8 +407,8 @@ referenced by <name>, but are still locally available in "remotes/<name>". </p> -<p>With <tt>--dry-run</tt> option, report what branches will be pruned, but do no -actually prune them.</p> +<div class="para"><p>With <tt>--dry-run</tt> option, report what branches will be pruned, but do no +actually prune them.</p></div> </dd> <dt> <em>update</em> @@ -375,17 +423,17 @@ be updated. (See <a href="git-config.html">git-config(1)</a>). </p> </dd> -</dl> +</dl></div> </div> -<h2>DISCUSSION</h2> +<h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> -<p>The remote configuration is achieved using the <tt>remote.origin.url</tt> and +<div class="para"><p>The remote configuration is achieved using the <tt>remote.origin.url</tt> and <tt>remote.origin.fetch</tt> configuration variables. (See -<a href="git-config.html">git-config(1)</a>).</p> +<a href="git-config.html">git-config(1)</a>).</p></div> </div> -<h2>Examples</h2> +<h2 id="_examples">Examples</h2> <div class="sectionbody"> -<ul> +<div class="ilist"><ul> <li> <p> Add a new remote, fetch, and check out a branch from it @@ -412,7 +460,7 @@ </li> <li> <p> -Imitate <em>git clone</em> but track only selected branches +Imitate <em>git-clone</em> but track only selected branches </p> <div class="listingblock"> <div class="content"> @@ -423,29 +471,29 @@ $ git merge origin</tt></pre> </div></div> </li> -</ul> +</ul></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-fetch.html">git-fetch(1)</a> +<div class="para"><p><a href="git-fetch.html">git-fetch(1)</a> <a href="git-branch.html">git-branch(1)</a> -<a href="git-config.html">git-config(1)</a></p> +<a href="git-config.html">git-config(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio Hamano</p> +<div class="para"><p>Written by Junio Hamano</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by J. Bruce Fields and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by J. Bruce Fields and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:59 UTC +Last updated 2008-07-06 05:16:59 UTC </div> </div> </body> diff --git a/git-remote.txt b/git-remote.txt index 32db0ae..bb99810 100644 --- a/git-remote.txt +++ b/git-remote.txt
@@ -10,11 +10,11 @@ -------- [verse] 'git remote' [-v | --verbose] -'git remote' add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url> -'git remote' rm <name> -'git remote' show [-n] <name> -'git remote' prune [-n | --dry-run] <name> -'git remote' update [group] +'git remote add' [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url> +'git remote rm' <name> +'git remote show' [-n] <name> +'git remote prune' [-n | --dry-run] <name> +'git remote update' [group] DESCRIPTION ----------- @@ -124,7 +124,7 @@ ... ------------ -* Imitate 'git clone' but track only selected branches +* Imitate 'git-clone' but track only selected branches + ------------ $ mkdir project.git
diff --git a/git-repack.html b/git-repack.html index c2c792e..09c39a7 100644 --- a/git-repack.html +++ b/git-repack.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-repack(1)</title> </head> @@ -272,22 +320,22 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git repack</em> [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N]</p> +<div class="para"><p><em>git repack</em> [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This script is used to combine all objects that do not currently +<div class="para"><p>This script is used to combine all objects that do not currently reside in a "pack", into a pack. It can also be used to re-organize -existing packs into a single, more efficient pack.</p> -<p>A pack is a collection of objects, individually compressed, with +existing packs into a single, more efficient pack.</p></div> +<div class="para"><p>A pack is a collection of objects, individually compressed, with delta compression applied, stored in a single file, with an -associated index file.</p> -<p>Packs are used to reduce the load on mirror systems, backup -engines, disk storage, etc.</p> +associated index file.</p></div> +<div class="para"><p>Packs are used to reduce the load on mirror systems, backup +engines, disk storage, etc.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -a </dt> @@ -317,7 +365,7 @@ deleted by way of being left in the old pack and then removed. Instead, the loose unreachable objects will be pruned according to normal expiry rules - with the next <tt>git-gc</tt> invocation. See <a href="git-gc.html">git-gc(1)</a>. + with the next <em>git-gc</em> invocation. See <a href="git-gc.html">git-gc(1)</a>. </p> </dd> <dt> @@ -327,7 +375,7 @@ <p> After packing, if the newly created packs make some existing packs redundant, remove the redundant packs. - Also run <tt>git-prune-packed</tt> to remove redundant + Also run <em>git-prune-packed</em> to remove redundant loose object files. </p> </dd> @@ -336,7 +384,7 @@ </dt> <dd> <p> - Pass the <tt>--local</tt> option to <tt>git-pack-objects</tt>. See + Pass the <tt>--local</tt> option to <em>git-pack-objects</em>. See <a href="git-pack-objects.html">git-pack-objects(1)</a>. </p> </dd> @@ -345,7 +393,7 @@ </dt> <dd> <p> - Pass the <tt>--no-reuse-delta</tt> option to <tt>git-pack-objects</tt>. See + Pass the <tt>--no-reuse-delta</tt> option to <em>git-pack-objects</em>. See <a href="git-pack-objects.html">git-pack-objects(1)</a>. </p> </dd> @@ -354,7 +402,7 @@ </dt> <dd> <p> - Pass the <tt>-q</tt> option to <tt>git-pack-objects</tt>. See + Pass the <tt>-q</tt> option to <em>git-pack-objects</em>. See <a href="git-pack-objects.html">git-pack-objects(1)</a>. </p> </dd> @@ -364,10 +412,10 @@ <dd> <p> Do not update the server information with - <tt>git-update-server-info</tt>. This option skips + <em>git-update-server-info</em>. This option skips updating local catalog files needed to publish this repository (or a direct copy of it) - over HTTP or FTP. See . + over HTTP or FTP. See <a href="git-update-server-info.html">git-update-server-info(1)</a>. </p> </dd> <dt> @@ -414,40 +462,40 @@ The default is unlimited. </p> </dd> -</dl> +</dl></div> </div> -<h2>Configuration</h2> +<h2 id="_configuration">Configuration</h2> <div class="sectionbody"> -<p>When configuration variable <tt>repack.UseDeltaBaseOffset</tt> is set +<div class="para"><p>When configuration variable <tt>repack.UseDeltaBaseOffset</tt> is set for the repository, the command passes <tt>--delta-base-offset</tt> -option to <tt>git-pack-objects</tt>; this typically results in slightly +option to <em>git-pack-objects</em>; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of git older than (and including) v1.4.3; do not set the variable in a repository that older version of git needs to be able to read (this includes repositories from which packs can be copied out over http or rsync, and people who obtained packs -that way can try to use older git with it).</p> +that way can try to use older git with it).</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Ryan Anderson <ryan@michonline.com></p> +<div class="para"><p>Documentation by Ryan Anderson <ryan@michonline.com></p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-pack-objects.html">git-pack-objects(1)</a> -<a href="git-prune-packed.html">git-prune-packed(1)</a></p> +<div class="para"><p><a href="git-pack-objects.html">git-pack-objects(1)</a> +<a href="git-prune-packed.html">git-prune-packed(1)</a></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:59 UTC +Last updated 2008-07-06 05:16:59 UTC </div> </div> </body> diff --git a/git-repack.txt b/git-repack.txt index 0d72e83..38ac609 100644 --- a/git-repack.txt +++ b/git-repack.txt
@@ -47,32 +47,32 @@ deleted by way of being left in the old pack and then removed. Instead, the loose unreachable objects will be pruned according to normal expiry rules - with the next `git-gc` invocation. See linkgit:git-gc[1]. + with the next 'git-gc' invocation. See linkgit:git-gc[1]. -d:: After packing, if the newly created packs make some existing packs redundant, remove the redundant packs. - Also run `git-prune-packed` to remove redundant + Also run 'git-prune-packed' to remove redundant loose object files. -l:: - Pass the `--local` option to `git-pack-objects`. See + Pass the `--local` option to 'git-pack-objects'. See linkgit:git-pack-objects[1]. -f:: - Pass the `--no-reuse-delta` option to `git-pack-objects`. See + Pass the `--no-reuse-delta` option to 'git-pack-objects'. See linkgit:git-pack-objects[1]. -q:: - Pass the `-q` option to `git-pack-objects`. See + Pass the `-q` option to 'git-pack-objects'. See linkgit:git-pack-objects[1]. -n:: Do not update the server information with - `git-update-server-info`. This option skips + 'git-update-server-info'. This option skips updating local catalog files needed to publish this repository (or a direct copy of it) - over HTTP or FTP. See gitlink:git-update-server-info[1]. + over HTTP or FTP. See linkgit:git-update-server-info[1]. --window=[N]:: --depth=[N]:: @@ -107,7 +107,7 @@ When configuration variable `repack.UseDeltaBaseOffset` is set for the repository, the command passes `--delta-base-offset` -option to `git-pack-objects`; this typically results in slightly +option to 'git-pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of git older than (and including) v1.4.3; do not set the variable in a repository that older version of git needs to
diff --git a/git-rerere.html b/git-rerere.html index fab9d72..9c5b43a 100644 --- a/git-rerere.html +++ b/git-rerere.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-rerere(1)</title> </head> @@ -272,18 +320,18 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git rerere</em> [clear|diff|status|gc]</p> +<div class="para"><p><em>git rerere</em> [<em>clear</em>|<em>diff</em>|<em>status</em>|<em>gc</em>]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>In a workflow that employs relatively long lived topic branches, +<div class="para"><p>In a workflow that employs relatively long lived topic branches, the developer sometimes needs to resolve the same conflict over and over again until the topic branches are done (either merged -to the "release" branch, or sent out and accepted upstream).</p> -<p>This command helps this process by recording conflicted +to the "release" branch, or sent out and accepted upstream).</p></div> +<div class="para"><p>This command helps this process by recording conflicted automerge results and corresponding hand-resolve results on the initial manual merge, and later by noticing the same automerge -results and applying the previously recorded hand resolution.</p> +results and applying the previously recorded hand resolution.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -294,19 +342,19 @@ </tr></table> </div> </div> -<h2>COMMANDS</h2> +<h2 id="_commands">COMMANDS</h2> <div class="sectionbody"> -<p>Normally, <tt>git-rerere</tt> is run without arguments or user-intervention. +<div class="para"><p>Normally, <em>git-rerere</em> is run without arguments or user-intervention. However, it has several commands that allow it to interact with -its working state.</p> -<dl> +its working state.</p></div> +<div class="vlist"><dl> <dt> <em>clear</em> </dt> <dd> <p> This resets the metadata used by rerere if a merge resolution is to be -is aborted. Calling <tt>git-am --skip</tt> or <tt>git-rebase [--skip|--abort]</tt> +is aborted. Calling <em>git-am --skip</em> or <em>git-rebase [--skip|--abort]</em> will automatically invoke this command. </p> </dd> @@ -318,7 +366,7 @@ This displays diffs for the current state of the resolution. It is useful for tracking what has changed while the user is resolving conflicts. Additional arguments are passed directly to the system -<tt>diff</tt> command installed in PATH. +<em>diff</em> command installed in PATH. </p> </dd> <dt> @@ -326,7 +374,7 @@ </dt> <dd> <p> -Like diff, but this only prints the filenames that will be tracked +Like <em>diff</em>, but this only prints the filenames that will be tracked for resolutions. </p> </dd> @@ -343,22 +391,22 @@ variables. </p> </dd> -</dl> +</dl></div> </div> -<h2>DISCUSSION</h2> +<h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> -<p>When your topic branch modifies overlapping area that your +<div class="para"><p>When your topic branch modifies overlapping area that your master branch (or upstream) touched since your topic branch forked from it, you may want to test it with the latest master, -even before your topic branch is ready to be pushed upstream:</p> +even before your topic branch is ready to be pushed upstream:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> o---*---o topic / o---o---o---*---o---o master</tt></pre> </div></div> -<p>For such a test, you need to merge master and topic somehow. -One way to do it is to pull master into the topic branch:</p> +<div class="para"><p>For such a test, you need to merge master and topic somehow. +One way to do it is to pull master into the topic branch:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git checkout topic @@ -368,17 +416,17 @@ / / o---o---o---*---o---o master</tt></pre> </div></div> -<p>The commits marked with <tt>*</tt> touch the same area in the same +<div class="para"><p>The commits marked with <tt>*</tt> touch the same area in the same file; you need to resolve the conflicts when creating the commit marked with <tt>+</tt>. Then you can test the result to make sure your -work-in-progress still works with what is in the latest master.</p> -<p>After this test merge, there are two ways to continue your work +work-in-progress still works with what is in the latest master.</p></div> +<div class="para"><p>After this test merge, there are two ways to continue your work on the topic. The easiest is to build on top of the test merge -commit <tt>+</tt>, and when your work in the topic branch is finally +commit <tt><tt></tt>, and when your work in the topic branch is finally ready, pull the topic branch into master, and/or ask the upstream to pull from you. By that time, however, the master or -the upstream might have been advanced since the test merge <tt>+</tt>, -in which case the final commit graph would look like this:</p> +the upstream might have been advanced since the test merge <tt></tt></tt>, +in which case the final commit graph would look like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git checkout topic @@ -391,15 +439,15 @@ / / \ o---o---o---*---o---o---o---o---+ master</tt></pre> </div></div> -<p>When your topic branch is long-lived, however, your topic branch +<div class="para"><p>When your topic branch is long-lived, however, your topic branch would end up having many such "Merge from master" commits on it, which would unnecessarily clutter the development history. Readers of the Linux kernel mailing list may remember that Linus complained about such too frequent test merges when a subsystem -maintainer asked to pull from a branch full of "useless merges".</p> -<p>As an alternative, to keep the topic branch clean of test +maintainer asked to pull from a branch full of "useless merges".</p></div> +<div class="para"><p>As an alternative, to keep the topic branch clean of test merges, you could blow away the test merge, and keep building on -top of the tip before the test merge:</p> +top of the tip before the test merge:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git checkout topic @@ -413,45 +461,45 @@ / \ o---o---o---*---o---o---o---o---+ master</tt></pre> </div></div> -<p>This would leave only one merge commit when your topic branch is +<div class="para"><p>This would leave only one merge commit when your topic branch is finally ready and merged into the master branch. This merge would require you to resolve the conflict, introduced by the commits marked with <tt>*</tt>. However, often this conflict is the same conflict you resolved when you created the test merge you -blew away. <tt>git-rerere</tt> command helps you to resolve this final +blew away. <em>git-rerere</em> command helps you to resolve this final conflicted merge using the information from your earlier hand -resolve.</p> -<p>Running the <tt>git-rerere</tt> command immediately after a conflicted +resolve.</p></div> +<div class="para"><p>Running the <em>git-rerere</em> command immediately after a conflicted automerge records the conflicted working tree files, with the usual conflict markers <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> in them. Later, after you are done resolving the conflicts, -running <tt>git-rerere</tt> again records the resolved state of these +running <em>git-rerere</em> again records the resolved state of these files. Suppose you did this when you created the test merge of -master into the topic branch.</p> -<p>Next time, running <tt>git-rerere</tt> after seeing a conflicted +master into the topic branch.</p></div> +<div class="para"><p>Next time, running <em>git-rerere</em> after seeing a conflicted automerge, if the conflict is the same as the earlier one recorded, it is noticed and a three-way merge between the earlier conflicted automerge, the earlier manual resolution, and the current conflicted automerge is performed by the command. If this three-way merge resolves cleanly, the result is written out to your working tree file, so you would not have to manually -resolve it. Note that <tt>git-rerere</tt> leaves the index file alone, +resolve it. Note that <em>git-rerere</em> leaves the index file alone, so you still need to do the final sanity checks with <tt>git diff</tt> -(or <tt>git diff -c</tt>) and <tt>git add</tt> when you are satisfied.</p> -<p>As a convenience measure, <tt>git-merge</tt> automatically invokes -<tt>git-rerere</tt> when it exits with a failed automerge, which +(or <tt>git diff -c</tt>) and <em>git-add</em> when you are satisfied.</p></div> +<div class="para"><p>As a convenience measure, <em>git-merge</em> automatically invokes +<em>git-rerere</em> when it exits with a failed automerge, which records it if it is a new conflict, or reuses the earlier hand -resolve when it is not. <tt>git-commit</tt> also invokes <tt>git-rerere</tt> +resolve when it is not. <em>git-commit</em> also invokes <em>git-rerere</em> when recording a merge result. What this means is that you do not have to do anything special yourself (Note: you still have -to set the config variable rerere.enabled to enable this command).</p> -<p>In our example, when you did the test merge, the manual +to set the config variable rerere.enabled to enable this command).</p></div> +<div class="para"><p>In our example, when you did the test merge, the manual resolution is recorded, and it will be reused when you do the actual merge later with updated master and topic branch, as long -as the earlier resolution is still applicable.</p> -<p>The information <tt>git-rerere</tt> records is also used when running -<tt>git-rebase</tt>. After blowing away the test merge and continuing -development on the topic branch:</p> +as the earlier resolution is still applicable.</p></div> +<div class="para"><p>The information <em>git-rerere</em> records is also used when running +<em>git-rebase</em>. After blowing away the test merge and continuing +development on the topic branch:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> o---*---o-------o---o topic @@ -464,24 +512,24 @@ / o---o---o---*---o---o---o---o master</tt></pre> </div></div> -<p>you could run <tt>git rebase master topic</tt>, to keep yourself +<div class="para"><p>you could run <tt>git rebase master topic</tt>, to keep yourself up-to-date even before your topic is ready to be sent upstream. This would result in falling back to three-way merge, and it would conflict the same way the test merge you resolved earlier. -<tt>git-rerere</tt> is run by <tt>git-rebase</tt> to help you resolve this -conflict.</p> +<em>git-rerere</em> is run by <em>git-rebase</em> to help you resolve this +conflict.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:59 UTC +Last updated 2008-07-06 05:16:59 UTC </div> </div> </body> diff --git a/git-rerere.txt b/git-rerere.txt index 3458029..678bfd3 100644 --- a/git-rerere.txt +++ b/git-rerere.txt
@@ -7,7 +7,7 @@ SYNOPSIS -------- -'git rerere' [clear|diff|status|gc] +'git rerere' ['clear'|'diff'|'status'|'gc'] DESCRIPTION ----------- @@ -30,14 +30,14 @@ COMMANDS -------- -Normally, `git-rerere` is run without arguments or user-intervention. +Normally, 'git-rerere' is run without arguments or user-intervention. However, it has several commands that allow it to interact with its working state. 'clear':: This resets the metadata used by rerere if a merge resolution is to be -is aborted. Calling `git-am --skip` or `git-rebase [--skip|--abort]` +is aborted. Calling 'git-am --skip' or 'git-rebase [--skip|--abort]' will automatically invoke this command. 'diff':: @@ -45,11 +45,11 @@ This displays diffs for the current state of the resolution. It is useful for tracking what has changed while the user is resolving conflicts. Additional arguments are passed directly to the system -`diff` command installed in PATH. +'diff' command installed in PATH. 'status':: -Like diff, but this only prints the filenames that will be tracked +Like 'diff', but this only prints the filenames that will be tracked for resolutions. 'gc':: @@ -142,33 +142,33 @@ would require you to resolve the conflict, introduced by the commits marked with `*`. However, often this conflict is the same conflict you resolved when you created the test merge you -blew away. `git-rerere` command helps you to resolve this final +blew away. 'git-rerere' command helps you to resolve this final conflicted merge using the information from your earlier hand resolve. -Running the `git-rerere` command immediately after a conflicted +Running the 'git-rerere' command immediately after a conflicted automerge records the conflicted working tree files, with the usual conflict markers `<<<<<<<`, `=======`, and `>>>>>>>` in them. Later, after you are done resolving the conflicts, -running `git-rerere` again records the resolved state of these +running 'git-rerere' again records the resolved state of these files. Suppose you did this when you created the test merge of master into the topic branch. -Next time, running `git-rerere` after seeing a conflicted +Next time, running 'git-rerere' after seeing a conflicted automerge, if the conflict is the same as the earlier one recorded, it is noticed and a three-way merge between the earlier conflicted automerge, the earlier manual resolution, and the current conflicted automerge is performed by the command. If this three-way merge resolves cleanly, the result is written out to your working tree file, so you would not have to manually -resolve it. Note that `git-rerere` leaves the index file alone, +resolve it. Note that 'git-rerere' leaves the index file alone, so you still need to do the final sanity checks with `git diff` -(or `git diff -c`) and `git add` when you are satisfied. +(or `git diff -c`) and 'git-add' when you are satisfied. -As a convenience measure, `git-merge` automatically invokes -`git-rerere` when it exits with a failed automerge, which +As a convenience measure, 'git-merge' automatically invokes +'git-rerere' when it exits with a failed automerge, which records it if it is a new conflict, or reuses the earlier hand -resolve when it is not. `git-commit` also invokes `git-rerere` +resolve when it is not. 'git-commit' also invokes 'git-rerere' when recording a merge result. What this means is that you do not have to do anything special yourself (Note: you still have to set the config variable rerere.enabled to enable this command). @@ -178,8 +178,8 @@ actual merge later with updated master and topic branch, as long as the earlier resolution is still applicable. -The information `git-rerere` records is also used when running -`git-rebase`. After blowing away the test merge and continuing +The information 'git-rerere' records is also used when running +'git-rebase'. After blowing away the test merge and continuing development on the topic branch: ------------ @@ -198,7 +198,7 @@ up-to-date even before your topic is ready to be sent upstream. This would result in falling back to three-way merge, and it would conflict the same way the test merge you resolved earlier. -`git-rerere` is run by `git-rebase` to help you resolve this +'git-rerere' is run by 'git-rebase' to help you resolve this conflict.
diff --git a/git-reset.html b/git-reset.html index dde5e32..980c50b 100644 --- a/git-reset.html +++ b/git-reset.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-reset(1)</title> </head> @@ -276,21 +324,21 @@ <div class="content"><em>git reset</em> [--mixed | --soft | --hard] [-q] [<commit>] <em>git reset</em> [-q] [<commit>] [--] <paths>…</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Sets the current head to the specified commit and optionally resets the -index and working tree to match.</p> -<p>This command is useful if you notice some small error in a recent +<div class="para"><p>Sets the current head to the specified commit and optionally resets the +index and working tree to match.</p></div> +<div class="para"><p>This command is useful if you notice some small error in a recent commit (or set of commits) and want to redo that part without showing -the undo in the history.</p> -<p>If you want to undo a commit other than the latest on a branch, -<a href="git-revert.html">git-revert(1)</a> is your friend.</p> -<p>The second form with <em>paths</em> is used to revert selected paths in -the index from a given commit, without moving HEAD.</p> +the undo in the history.</p></div> +<div class="para"><p>If you want to undo a commit other than the latest on a branch, +<a href="git-revert.html">git-revert(1)</a> is your friend.</p></div> +<div class="para"><p>The second form with <em>paths</em> is used to revert selected paths in +the index from a given commit, without moving HEAD.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --mixed </dt> @@ -308,7 +356,7 @@ <p> Does not touch the index file nor the working tree at all, but requires them to be in a good order. This leaves all your changed - files "Changes to be committed", as <tt>git-status</tt> would + files "Changes to be committed", as <em>git-status</em> would put it. </p> </dd> @@ -338,11 +386,11 @@ Commit to make the current HEAD. If not given defaults to HEAD. </p> </dd> -</dl> +</dl></div> </div> -<h2>Examples</h2> +<h2 id="_examples">Examples</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> Undo a commit and redo </dt> @@ -354,7 +402,7 @@ $ edit <b>(2)</b> $ git commit -a -c ORIG_HEAD <b>(3)</b></tt></pre> </div></div> -<ol> +<div class="colist"><ol> <li> <p> This is most often done when you remembered what you @@ -373,9 +421,9 @@ commit by starting with its log message. If you do not need to edit the message further, you can give -C option instead. </p> -<p>See also the --amend option to <a href="git-commit.html">git-commit(1)</a>.</p> +<div class="para"><p>See also the --amend option to <a href="git-commit.html">git-commit(1)</a>.</p></div> </li> -</ol> +</ol></div> </dd> <dt> Undo commits permanently @@ -386,7 +434,7 @@ <pre><tt>$ git commit ... $ git reset --hard HEAD~3 <b>(1)</b></tt></pre> </div></div> -<ol> +<div class="colist"><ol> <li> <p> The last three commits (HEAD, HEAD^, and HEAD~2) were bad @@ -394,7 +442,7 @@ you have already given these commits to somebody else. </p> </li> -</ol> +</ol></div> </dd> <dt> Undo a commit, making it a topic branch @@ -406,7 +454,7 @@ $ git reset --hard HEAD~3 <b>(2)</b> $ git checkout topic/wip <b>(3)</b></tt></pre> </div></div> -<ol> +<div class="colist"><ol> <li> <p> You have made some commits, but realize they were premature @@ -425,7 +473,7 @@ Switch to "topic/wip" branch and keep working. </p> </li> -</ol> +</ol></div> </dd> <dt> Undo add @@ -439,7 +487,7 @@ $ git reset <b>(3)</b> $ git pull git://info.example.com/ nitfol <b>(4)</b></tt></pre> </div></div> -<ol> +<div class="colist"><ol> <li> <p> You are happily working on something, and find the changes @@ -468,7 +516,7 @@ changes still in the working tree. </p> </li> -</ol> +</ol></div> </dd> <dt> Undo a merge or pull @@ -486,7 +534,7 @@ Fast forward $ git reset --hard ORIG_HEAD <b>(4)</b></tt></pre> </div></div> -<ol> +<div class="colist"><ol> <li> <p> Try to update from the upstream resulted in a lot of @@ -516,16 +564,16 @@ and resets the tip of the branch to that commit. </p> </li> -</ol> +</ol></div> </dd> <dt> Interrupted workflow </dt> <dd> -<p>Suppose you are interrupted by an urgent fix request while you +<div class="para"><p>Suppose you are interrupted by an urgent fix request while you are in the middle of a large change. The files in your working tree are not in any shape to be committed yet, but you -need to get to the other branch for a quick bugfix.</p> +need to get to the other branch for a quick bugfix.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout feature ;# you were working in "feature" branch and @@ -538,7 +586,7 @@ $ git reset --soft HEAD^ ;# go back to WIP state <b>(2)</b> $ git reset <b>(3)</b></tt></pre> </div></div> -<ol> +<div class="colist"><ol> <li> <p> This commit will get blown away so a throw-away log message is OK. @@ -557,22 +605,22 @@ WIP files as uncommitted. </p> </li> -</ol> +</ol></div> </dd> <dt> Reset a single file in the index </dt> <dd> -<p>Suppose you have added a file to your index, but later decide you do not +<div class="para"><p>Suppose you have added a file to your index, but later decide you do not want to add it to your commit. You can remove the file from the index -while keeping your changes with git reset.</p> +while keeping your changes with git reset.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git reset -- frotz.c <b>(1)</b> $ git commit -m "Commit files in index" <b>(2)</b> $ git add frotz.c <b>(3)</b></tt></pre> </div></div> -<ol> +<div class="colist"><ol> <li> <p> This removes the file from the index while keeping it in the working @@ -589,25 +637,25 @@ Adds the file to the index again. </p> </li> -</ol> +</ol></div> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net> and Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net> and Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:59 UTC +Last updated 2008-07-06 05:16:59 UTC </div> </div> </body> diff --git a/git-reset.txt b/git-reset.txt index dc05f58..c8d1757 100644 --- a/git-reset.txt +++ b/git-reset.txt
@@ -37,7 +37,7 @@ --soft:: Does not touch the index file nor the working tree at all, but requires them to be in a good order. This leaves all your changed - files "Changes to be committed", as `git-status` would + files "Changes to be committed", as 'git-status' would put it. --hard::
diff --git a/git-rev-list.html b/git-rev-list.html index 5a94c91..29ad5b3 100644 --- a/git-rev-list.html +++ b/git-rev-list.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-rev-list(1)</title> </head> @@ -311,49 +359,49 @@ [ --no-walk ] [ --do-walk ] <commit>… [ -- <paths>… ]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Lists commit objects in reverse chronological order starting at the +<div class="para"><p>Lists commit objects in reverse chronological order starting at the given commit(s), taking ancestry relationship into account. This is -useful to produce human-readable log output.</p> -<p>Commits which are stated with a preceding <em>^</em> cause listing to +useful to produce human-readable log output.</p></div> +<div class="para"><p>Commits which are stated with a preceding <em>^</em> cause listing to stop at that point. Their parents are implied. Thus the following -command:</p> +command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git rev-list foo bar ^baz</tt></pre> </div></div> -<p>means "list all the commits which are included in <em>foo</em> and <em>bar</em>, but -not in <em>baz</em>".</p> -<p>A special notation "<em><commit1></em>..<em><commit2></em>" can be used as a +<div class="para"><p>means "list all the commits which are included in <em>foo</em> and <em>bar</em>, but +not in <em>baz</em>".</p></div> +<div class="para"><p>A special notation "<em><commit1></em>..<em><commit2></em>" can be used as a short-hand for "^<em><commit1></em> <em><commit2></em>". For example, either of -the following may be used interchangeably:</p> +the following may be used interchangeably:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git rev-list origin..HEAD $ git rev-list HEAD ^origin</tt></pre> </div></div> -<p>Another special notation is "<em><commit1></em>…<em><commit2></em>" which is useful +<div class="para"><p>Another special notation is "<em><commit1></em>…<em><commit2></em>" which is useful for merges. The resulting set of commits is the symmetric difference -between the two operands. The following two commands are equivalent:</p> +between the two operands. The following two commands are equivalent:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git rev-list A B --not $(git merge-base --all A B) $ git rev-list A...B</tt></pre> </div></div> -<p><tt>git-rev-list</tt> is a very essential git program, since it +<div class="para"><p><em>git-rev-list</em> is a very essential git program, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be -used by commands as different as <tt>git-bisect</tt> and -<tt>git-repack</tt>.</p> +used by commands as different as <em>git-bisect</em> and +<em>git-repack</em>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<h3>Commit Formatting</h3> -<p>Using these options, <a href="git-rev-list.html">git-rev-list(1)</a> will act similar to the +<h3 id="_commit_formatting">Commit Formatting</h3><div style="clear:left"></div> +<div class="para"><p>Using these options, <a href="git-rev-list.html">git-rev-list(1)</a> will act similar to the more specialized family of commit log tools: <a href="git-log.html">git-log(1)</a>, -<a href="git-show.html">git-show(1)</a>, and <a href="git-whatchanged.html">git-whatchanged(1)</a></p> -<dl> +<a href="git-show.html">git-show(1)</a>, and <a href="git-whatchanged.html">git-whatchanged(1)</a></p></div> +<div class="vlist"><dl> <dt> --pretty[=<em><format></em>] </dt> @@ -364,8 +412,8 @@ <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. When omitted, the format defaults to <em>medium</em>. </p> -<p>Note: you can specify the default pretty format in the repository -configuration (see <a href="git-config.html">git-config(1)</a>).</p> +<div class="para"><p>Note: you can specify the default pretty format in the repository +configuration (see <a href="git-config.html">git-config(1)</a>).</p></div> </dd> <dt> --abbrev-commit @@ -377,8 +425,8 @@ digits can be specified with "--abbrev=<n>" (which also modifies diff output, if it is displayed). </p> -<p>This should make "--pretty=oneline" a whole lot more readable for -people using 80-column terminals.</p> +<div class="para"><p>This should make "--pretty=oneline" a whole lot more readable for +people using 80-column terminals.</p></div> </dd> <dt> --encoding[=<encoding>] @@ -409,15 +457,15 @@ as when using "--pretty". <tt>log.date</tt> config variable sets a default value for log command's --date option. </p> -<p><tt>--date=relative</tt> shows dates relative to the current time, -e.g. "2 hours ago".</p> -<p><tt>--date=local</tt> shows timestamps in user's local timezone.</p> -<p><tt>--date=iso</tt> (or <tt>--date=iso8601</tt>) shows timestamps in ISO 8601 format.</p> -<p><tt>--date=rfc</tt> (or <tt>--date=rfc2822</tt>) shows timestamps in RFC 2822 -format, often found in E-mail messages.</p> -<p><tt>--date=short</tt> shows only date but not time, in <tt>YYYY-MM-DD</tt> format.</p> -<p><tt>--date=default</tt> shows timestamps in the original timezone -(either committer's or author's).</p> +<div class="para"><p><tt>--date=relative</tt> shows dates relative to the current time, +e.g. "2 hours ago".</p></div> +<div class="para"><p><tt>--date=local</tt> shows timestamps in user's local timezone.</p></div> +<div class="para"><p><tt>--date=iso</tt> (or <tt>--date=iso8601</tt>) shows timestamps in ISO 8601 format.</p></div> +<div class="para"><p><tt>--date=rfc</tt> (or <tt>--date=rfc2822</tt>) shows timestamps in RFC 2822 +format, often found in E-mail messages.</p></div> +<div class="para"><p><tt>--date=short</tt> shows only date but not time, in <tt>YYYY-MM-DD</tt> format.</p></div> +<div class="para"><p><tt>--date=default</tt> shows timestamps in the original timezone +(either committer's or author's).</p></div> </dd> <dt> --header @@ -454,7 +502,7 @@ the right with <tt>></tt>. If combined with <tt>--boundary</tt>, those commits are prefixed with <tt>-</tt>. </p> -<p>For example, if you have this topology:</p> +<div class="para"><p>For example, if you have this topology:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> y---b---b branch B @@ -463,7 +511,7 @@ / / \ o---x---a---a branch A</tt></pre> </div></div> -<p>you would get an output line this:</p> +<div class="para"><p>you would get an output line this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git rev-list --left-right --boundary --pretty=oneline A...B @@ -486,15 +534,15 @@ to be printed in between commits, in order for the graph history to be drawn properly. </p> -<p>This implies the <em>--topo-order</em> option by default, but the -<em>--date-order</em> option may also be specified.</p> +<div class="para"><p>This implies the <em>--topo-order</em> option by default, but the +<em>--date-order</em> option may also be specified.</p></div> </dd> -</dl> -<h3>Diff Formatting</h3> -<p>Below are listed options that control the formatting of diff output. +</dl></div> +<h3 id="_diff_formatting">Diff Formatting</h3><div style="clear:left"></div> +<div class="para"><p>Below are listed options that control the formatting of diff output. Some of them are specific to <a href="git-rev-list.html">git-rev-list(1)</a>, however other diff -options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p> -<dl> +options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p></div> +<div class="vlist"><dl> <dt> -c </dt> @@ -534,12 +582,12 @@ Show the tree objects in the diff output. This implies <em>-r</em>. </p> </dd> -</dl> -<h3>Commit Limiting</h3> -<p>Besides specifying a range of commits that should be listed using the +</dl></div> +<h3 id="_commit_limiting">Commit Limiting</h3><div style="clear:left"></div> +<div class="para"><p>Besides specifying a range of commits that should be listed using the special notations explained in the description, additional commit -limiting may be applied.</p> -<dl> +limiting may be applied.</p></div> +<div class="vlist"><dl> <dt> -n <em>number</em> </dt> @@ -766,8 +814,8 @@ instead. Under <em>--pretty=oneline</em>, the commit message is prefixed with this information on the same line. </p> -<p>Cannot be combined with <em>--reverse</em>. -See also <a href="git-reflog.html">git-reflog(1)</a>.</p> +<div class="para"><p>Cannot be combined with <em>--reverse</em>. +See also <a href="git-reflog.html">git-reflog(1)</a>.</p></div> </dd> <dt> --merge @@ -799,9 +847,9 @@ only output commits that changes at least one of them, and also ignore merges that do not touch the given paths. </p> -<p>Use the <em>--sparse</em> flag to makes the command output all eligible commits +<div class="para"><p>Use the <em>--sparse</em> flag to makes the command output all eligible commits (still subject to count and age limitation), but apply merge -simplification nevertheless.</p> +simplification nevertheless.</p></div> </dd> <dt> --bisect @@ -815,16 +863,16 @@ <div class="content"> <pre><tt> $ git-rev-list --bisect foo ^bar ^baz</tt></pre> </div></div> -<p>outputs <em>midpoint</em>, the output of the two commands</p> +<div class="para"><p>outputs <em>midpoint</em>, the output of the two commands</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git-rev-list foo ^midpoint $ git-rev-list midpoint ^bar ^baz</tt></pre> </div></div> -<p>would be of roughly the same length. Finding the change which +<div class="para"><p>would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length -one.</p> +one.</p></div> </dd> <dt> --bisect-vars @@ -852,17 +900,17 @@ commits. The farthest from them is displayed first. (This is the only one displayed by <tt>--bisect</tt>.) </p> -<p>This is useful because it makes it easy to choose a good commit to +<div class="para"><p>This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they -may not compile for example).</p> -<p>This option can be used along with <tt>--bisect-vars</tt>, in this case, +may not compile for example).</p></div> +<div class="para"><p>This option can be used along with <tt>--bisect-vars</tt>, in this case, after all the sorted commit objects, there will be the same text as if -<tt>--bisect-vars</tt> had been used alone.</p> +<tt>--bisect-vars</tt> had been used alone.</p></div> </dd> -</dl> -<h3>Commit Ordering</h3> -<p>By default, the commits are shown in reverse chronological order.</p> -<dl> +</dl></div> +<h3 id="_commit_ordering">Commit Ordering</h3><div style="clear:left"></div> +<div class="para"><p>By default, the commits are shown in reverse chronological order.</p></div> +<div class="vlist"><dl> <dt> --topo-order </dt> @@ -891,10 +939,10 @@ Cannot be combined with <em>--walk-reflogs</em>. </p> </dd> -</dl> -<h3>Object Traversal</h3> -<p>These options are mostly targeted for packing of git repositories.</p> -<dl> +</dl></div> +<h3 id="_object_traversal">Object Traversal</h3><div style="clear:left"></div> +<div class="para"><p>These options are mostly targeted for packing of git repositories.</p></div> +<div class="vlist"><dl> <dt> --objects </dt> @@ -943,11 +991,11 @@ Overrides a previous --no-walk. </p> </dd> -</dl> +</dl></div> </div> -<h2>PRETTY FORMATS</h2> +<h2 id="_pretty_formats">PRETTY FORMATS</h2> <div class="sectionbody"> -<p>If the commit is a merge, and if the pretty-format +<div class="para"><p>If the commit is a merge, and if the pretty-format is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is inserted before the <em>Author:</em> line. This line begins with "Merge: " and the sha1s of ancestral commits are printed, @@ -955,9 +1003,9 @@ necessarily be the list of the <strong>direct</strong> parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or -file.</p> -<p>Here are some additional details for each format:</p> -<ul> +file.</p></div> +<div class="para"><p>Here are some additional details for each format:</p></div> +<div class="ilist"><ul> <li> <p> <em>oneline</em> @@ -966,7 +1014,7 @@ <div class="content"> <pre><tt><sha1> <title line></tt></pre> </div></div> -<p>This is designed to be as compact as possible.</p> +<div class="para"><p>This is designed to be as compact as possible.</p></div> </li> <li> <p> @@ -990,7 +1038,7 @@ <div class="content"> <pre><tt>commit <sha1> Author: <author> -Date: <date></tt></pre> +Date: <author date></tt></pre> </div></div> <div class="literalblock"> <div class="content"> @@ -1028,9 +1076,9 @@ <div class="content"> <pre><tt>commit <sha1> Author: <author> -AuthorDate: <date & time> +AuthorDate: <author date> Commit: <committer> -CommitDate: <date & time></tt></pre> +CommitDate: <committer date></tt></pre> </div></div> <div class="literalblock"> <div class="content"> @@ -1049,7 +1097,7 @@ <div class="content"> <pre><tt>From <sha1> <date> From: <author> -Date: <date & time> +Date: <author date> Subject: [PATCH] <title line></tt></pre> </div></div> <div class="literalblock"> @@ -1061,31 +1109,31 @@ <p> <em>raw</em> </p> -<p>The <em>raw</em> format shows the entire commit exactly as +<div class="para"><p>The <em>raw</em> format shows the entire commit exactly as stored in the commit object. Notably, the SHA1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the true parent commits, without taking grafts nor history -simplification into account.</p> +simplification into account.</p></div> </li> <li> <p> <em>format:</em> </p> -<p>The <em>format:</em> format allows you to specify which information +<div class="para"><p>The <em>format:</em> format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with <em>%n</em> -instead of <em>\n</em>.</p> -<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em> -would show something like this:</p> +instead of <em>\n</em>.</p></div> +<div class="para"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em> +would show something like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago The title was >>t4119: test autocomputing -p<n> for traditional diff input.<< </tt></pre> </div></div> -<p>The placeholders are:</p> -<ul> +<div class="para"><p>The placeholders are:</p></div> +<div class="ilist"><ul> <li> <p> <em>%H</em>: commit hash @@ -1236,19 +1284,19 @@ <em>%x00</em>: print a byte from a hex code </p> </li> -</ul> +</ul></div> </li> <li> <p> <em>tformat:</em> </p> -<p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it +<div class="para"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it provides "terminator" semantics instead of "separator" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the "oneline" format does. -For example:</p> +For example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log -2 --pretty=format:%h 4da45bef \ @@ -1262,24 +1310,24 @@ 7134973</tt></pre> </div></div> </li> -</ul> +</ul></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano, Jonas Fonseca -and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano, Jonas Fonseca +and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:00 UTC +Last updated 2008-07-06 05:17:00 UTC </div> </div> </body> diff --git a/git-rev-list.txt b/git-rev-list.txt index e7d736f..fd1de92 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt
@@ -83,11 +83,11 @@ $ git rev-list A...B ----------------------------------------------------------------------- -`git-rev-list` is a very essential git program, since it +'git-rev-list' is a very essential git program, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be -used by commands as different as `git-bisect` and -`git-repack`. +used by commands as different as 'git-bisect' and +'git-repack'. OPTIONS -------
diff --git a/git-rev-parse.html b/git-rev-parse.html index 0286d4f..54309af 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-rev-parse(1)</title> </head> @@ -272,26 +320,26 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git rev-parse</em> [ --option ] <args>…</p> +<div class="para"><p><em>git rev-parse</em> [ --option ] <args>…</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Many git porcelainish commands take mixture of flags +<div class="para"><p>Many git porcelainish commands take mixture of flags (i.e. parameters that begin with a dash <em>-</em>) and parameters -meant for the underlying <tt>git-rev-list</tt> command they use internally +meant for the underlying <em>git-rev-list</em> command they use internally and flags and parameters for the other commands they use -downstream of <tt>git-rev-list</tt>. This command is used to -distinguish between them.</p> +downstream of <em>git-rev-list</em>. This command is used to +distinguish between them.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --parseopt </dt> <dd> <p> - Use <tt>git-rev-parse</tt> in option parsing mode (see PARSEOPT section below). + Use <em>git-rev-parse</em> in option parsing mode (see PARSEOPT section below). </p> </dd> <dt> @@ -309,7 +357,7 @@ <dd> <p> Do not output flags and parameters not meant for - <tt>git-rev-list</tt> command. + <em>git-rev-list</em> command. </p> </dd> <dt> @@ -318,7 +366,7 @@ <dd> <p> Do not output flags and parameters meant for - <tt>git-rev-list</tt> command. + <em>git-rev-list</em> command. </p> </dd> <dt> @@ -378,7 +426,7 @@ properly quoted for consumption by shell. Useful when you expect your parameter to contain whitespaces and newlines (e.g. when using pickaxe <tt>-S</tt> with - <tt>git-diff-*</tt>). + <em>git-diff-*</em>). </p> </dd> <dt> @@ -522,7 +570,7 @@ <dd> <p> Parse the date string, and output the corresponding - --max-age= parameter for <tt>git-rev-list</tt>. + --max-age= parameter for <em>git-rev-list</em>. </p> </dd> <dt> @@ -534,7 +582,7 @@ <dd> <p> Parse the date string, and output the corresponding - --min-age= parameter for <tt>git-rev-list</tt>. + --min-age= parameter for <em>git-rev-list</em>. </p> </dd> <dt> @@ -545,16 +593,16 @@ Flags and parameters to be parsed. </p> </dd> -</dl> +</dl></div> </div> -<h2>SPECIFYING REVISIONS</h2> +<h2 id="_specifying_revisions">SPECIFYING REVISIONS</h2> <div class="sectionbody"> -<p>A revision parameter typically, but not necessarily, names a +<div class="para"><p>A revision parameter typically, but not necessarily, names a commit object. They use what is called an <em>extended SHA1</em> syntax. Here are various ways to spell object names. The ones listed near the end of this list are to name trees and -blobs contained in a commit.</p> -<ul> +blobs contained in a commit.</p></div> +<div class="ilist"><ul> <li> <p> The full SHA1 object name (40-byte hexadecimal string), or @@ -566,7 +614,7 @@ </li> <li> <p> -An output from <tt>git-describe</tt>; i.e. a closest tag, followed by a +An output from <em>git-describe</em>; i.e. a closest tag, followed by a dash, a <tt>g</tt>, and an abbreviated object name. </p> </li> @@ -579,7 +627,7 @@ When ambiguous, a <tt><name></tt> is disambiguated by taking the first match in the following rules: </p> -<ol> +<div class="olist"><ol> <li> <p> if <tt>$GIT_DIR/<name></tt> exists, that is what you mean (this is usually @@ -611,7 +659,7 @@ otherwise, <tt>$GIT_DIR/refs/remotes/<name>/HEAD</tt> if exists. </p> </li> -</ol> +</ol></div> </li> <li> <p> @@ -711,10 +759,10 @@ the branch being merged. </p> </li> -</ul> -<p>Here is an illustration, by Jon Loeliger. Both commit nodes B +</ul></div> +<div class="para"><p>Here is an illustration, by Jon Loeliger. Both commit nodes B and C are parents of commit node A. Parent commits are ordered -left-to-right.</p> +left-to-right.</p></div> <div class="literalblock"> <div class="content"> <pre><tt>G H I J @@ -742,31 +790,31 @@ J = F^2 = B^3^2 = A^^3^2</tt></pre> </div></div> </div> -<h2>SPECIFYING RANGES</h2> +<h2 id="_specifying_ranges">SPECIFYING RANGES</h2> <div class="sectionbody"> -<p>History traversing commands such as <tt>git-log</tt> operate on a set +<div class="para"><p>History traversing commands such as <em>git-log</em> operate on a set of commits, not just a single commit. To these commands, specifying a single revision with the notation described in the previous section means the set of commits reachable from that -commit, following the commit ancestry chain.</p> -<p>To exclude commits reachable from a commit, a prefix <tt>^</tt> +commit, following the commit ancestry chain.</p></div> +<div class="para"><p>To exclude commits reachable from a commit, a prefix <tt>^</tt> notation is used. E.g. "<tt>^r1 r2</tt>" means commits reachable -from <tt>r2</tt> but exclude the ones reachable from <tt>r1</tt>.</p> -<p>This set operation appears so often that there is a shorthand +from <tt>r2</tt> but exclude the ones reachable from <tt>r1</tt>.</p></div> +<div class="para"><p>This set operation appears so often that there is a shorthand for it. "<tt>r1..r2</tt>" is equivalent to "<tt>^r1 r2</tt>". It is the difference of two sets (subtract the set of commits reachable from <tt>r1</tt> from the set of commits reachable from -<tt>r2</tt>).</p> -<p>A similar notation "<tt>r1...r2</tt>" is called symmetric difference +<tt>r2</tt>).</p></div> +<div class="para"><p>A similar notation "<tt>r1...r2</tt>" is called symmetric difference of <tt>r1</tt> and <tt>r2</tt> and is defined as "<tt>r1 r2 --not $(git merge-base --all r1 r2)</tt>". It is the set of commits that are reachable from either one of -<tt>r1</tt> or <tt>r2</tt> but not from both.</p> -<p>Two other shorthands for naming a set that is formed by a commit +<tt>r1</tt> or <tt>r2</tt> but not from both.</p></div> +<div class="para"><p>Two other shorthands for naming a set that is formed by a commit and its parent commits exists. <tt>r1^@</tt> notation means all parents of <tt>r1</tt>. <tt>r1^!</tt> includes commit <tt>r1</tt> but excludes -its all parents.</p> -<p>Here are a handful of examples:</p> +its all parents.</p></div> +<div class="para"><p>Here are a handful of examples:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>D G H D @@ -779,26 +827,26 @@ F^! D G H D F</tt></pre> </div></div> </div> -<h2>PARSEOPT</h2> +<h2 id="_parseopt">PARSEOPT</h2> <div class="sectionbody"> -<p>In <tt>--parseopt</tt> mode, <tt>git-rev-parse</tt> helps massaging options to bring to shell +<div class="para"><p>In <tt>--parseopt</tt> mode, <em>git-rev-parse</em> helps massaging options to bring to shell scripts the same facilities C builtins have. It works as an option normalizer -(e.g. splits single switches aggregate values), a bit like <tt>getopt(1)</tt> does.</p> -<p>It takes on the standard input the specification of the options to parse and +(e.g. splits single switches aggregate values), a bit like <tt>getopt(1)</tt> does.</p></div> +<div class="para"><p>It takes on the standard input the specification of the options to parse and understand, and echoes on the standard output a line suitable for <tt>sh(1)</tt> <tt>eval</tt> to replace the arguments with normalized ones. In case of error, it outputs -usage on the standard error stream, and exits with code 129.</p> -<h3>Input Format</h3> -<p><tt>git-rev-parse --parseopt</tt> input format is fully text based. It has two parts, +usage on the standard error stream, and exits with code 129.</p></div> +<h3 id="_input_format">Input Format</h3><div style="clear:left"></div> +<div class="para"><p><em>git-rev-parse --parseopt</em> input format is fully text based. It has two parts, separated by a line that contains only <tt>--</tt>. The lines before the separator (should be more than one) are used for the usage. -The lines after the separator describe the options.</p> -<p>Each line of options has this format:</p> +The lines after the separator describe the options.</p></div> +<div class="para"><p>Each line of options has this format:</p></div> <div class="listingblock"> <div class="content"> <pre><tt><opt_spec><flags>* SP+ help LF</tt></pre> </div></div> -<dl> +<div class="vlist"><dl> <dt> <tt><opt_spec></tt> </dt> @@ -817,7 +865,7 @@ <p> <tt><flags></tt> are of <tt>*</tt>, <tt>=</tt>, <tt>?</tt> or <tt>!</tt>. </p> -<ul> +<div class="ilist"><ul> <li> <p> Use <tt>=</tt> if the option takes an argument. @@ -840,15 +888,15 @@ Use <tt>!</tt> to not make the corresponding negated long option available. </p> </li> -</ul> +</ul></div> </dd> -</dl> -<p>The remainder of the line, after stripping the spaces, is used -as the help associated to the option.</p> -<p>Blank lines are ignored, and lines that don't match this specification are used +</dl></div> +<div class="para"><p>The remainder of the line, after stripping the spaces, is used +as the help associated to the option.</p></div> +<div class="para"><p>Blank lines are ignored, and lines that don't match this specification are used as option group headers (start the line with a space to create such -lines on purpose).</p> -<h3>Example</h3> +lines on purpose).</p></div> +<h3 id="_example">Example</h3><div style="clear:left"></div> <div class="listingblock"> <div class="content"> <pre><tt>OPTS_SPEC="\ @@ -867,9 +915,9 @@ eval `echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?`</tt></pre> </div></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<ul> +<div class="ilist"><ul> <li> <p> Print the object name of the current commit: @@ -887,7 +935,7 @@ <div class="content"> <pre><tt>$ git rev-parse --verify $REV</tt></pre> </div></div> -<p>This will error out if $REV is empty or not a valid revision.</p> +<div class="para"><p>This will error out if $REV is empty or not a valid revision.</p></div> </li> <li> <p> @@ -897,26 +945,26 @@ <div class="content"> <pre><tt>$ git rev-parse --default master --verify $REV</tt></pre> </div></div> -<p>but if $REV is empty, the commit object name from master will be printed.</p> +<div class="para"><p>but if $REV is empty, the commit object name from master will be printed.</p></div> </li> -</ul> +</ul></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org> . -Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> . +Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:00 UTC +Last updated 2008-07-06 05:17:00 UTC </div> </div> </body> diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 6825ae2..0501a87 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt
@@ -15,16 +15,16 @@ Many git porcelainish commands take mixture of flags (i.e. parameters that begin with a dash '-') and parameters -meant for the underlying `git-rev-list` command they use internally +meant for the underlying 'git-rev-list' command they use internally and flags and parameters for the other commands they use -downstream of `git-rev-list`. This command is used to +downstream of 'git-rev-list'. This command is used to distinguish between them. OPTIONS ------- --parseopt:: - Use `git-rev-parse` in option parsing mode (see PARSEOPT section below). + Use 'git-rev-parse' in option parsing mode (see PARSEOPT section below). --keep-dash-dash:: Only meaningful in `--parseopt` mode. Tells the option parser to echo @@ -32,11 +32,11 @@ --revs-only:: Do not output flags and parameters not meant for - `git-rev-list` command. + 'git-rev-list' command. --no-revs:: Do not output flags and parameters meant for - `git-rev-list` command. + 'git-rev-list' command. --flags:: Do not output non-flag parameters. @@ -64,7 +64,7 @@ properly quoted for consumption by shell. Useful when you expect your parameter to contain whitespaces and newlines (e.g. when using pickaxe `-S` with - `git-diff-\*`). + 'git-diff-\*'). --not:: When showing object names, prefix them with '{caret}' and @@ -129,12 +129,12 @@ --since=datestring:: --after=datestring:: Parse the date string, and output the corresponding - --max-age= parameter for `git-rev-list`. + --max-age= parameter for 'git-rev-list'. --until=datestring:: --before=datestring:: Parse the date string, and output the corresponding - --min-age= parameter for `git-rev-list`. + --min-age= parameter for 'git-rev-list'. <args>...:: Flags and parameters to be parsed. @@ -155,7 +155,7 @@ name the same commit object if there are no other object in your repository whose object name starts with dae86e. -* An output from `git-describe`; i.e. a closest tag, followed by a +* An output from 'git-describe'; i.e. a closest tag, followed by a dash, a `g`, and an abbreviated object name. * A symbolic ref name. E.g. 'master' typically means the commit @@ -278,7 +278,7 @@ SPECIFYING RANGES ----------------- -History traversing commands such as `git-log` operate on a set +History traversing commands such as 'git-log' operate on a set of commits, not just a single commit. To these commands, specifying a single revision with the notation described in the previous section means the set of commits reachable from that @@ -319,7 +319,7 @@ PARSEOPT -------- -In `--parseopt` mode, `git-rev-parse` helps massaging options to bring to shell +In `--parseopt` mode, 'git-rev-parse' helps massaging options to bring to shell scripts the same facilities C builtins have. It works as an option normalizer (e.g. splits single switches aggregate values), a bit like `getopt(1)` does. @@ -331,7 +331,7 @@ Input Format ~~~~~~~~~~~~ -`git-rev-parse --parseopt` input format is fully text based. It has two parts, +'git-rev-parse --parseopt' input format is fully text based. It has two parts, separated by a line that contains only `--`. The lines before the separator (should be more than one) are used for the usage. The lines after the separator describe the options. diff --git a/git-revert.html b/git-revert.html index 77d378b..ffcdcd0 100644 --- a/git-revert.html +++ b/git-revert.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-revert(1)</title> </head> @@ -272,17 +320,17 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git revert</em> [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit></p> +<div class="para"><p><em>git revert</em> [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Given one existing commit, revert the change the patch introduces, and record a +<div class="para"><p>Given one existing commit, revert the change the patch introduces, and record a new commit that records it. This requires your working tree to be clean (no -modifications from the HEAD commit).</p> +modifications from the HEAD commit).</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <commit> </dt> @@ -301,7 +349,7 @@ </dt> <dd> <p> - With this option, <tt>git-revert</tt> will let you edit the commit + With this option, <em>git-revert</em> will let you edit the commit message prior to committing the revert. This is the default if you run the command from a terminal. </p> @@ -326,7 +374,7 @@ </dt> <dd> <p> - With this option, <tt>git-revert</tt> will not start the commit + With this option, <em>git-revert</em> will not start the commit message editor. </p> </dd> @@ -347,8 +395,8 @@ The revert is done against the beginning state of your working tree. </p> -<p>This is useful when reverting more than one commits' -effect to your working tree in a row.</p> +<div class="para"><p>This is useful when reverting more than one commits' +effect to your working tree in a row.</p></div> </dd> <dt> -s @@ -361,23 +409,23 @@ Add Signed-off-by line at the end of the commit message. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:00 UTC +Last updated 2008-07-06 05:17:00 UTC </div> </div> </body> diff --git a/git-revert.txt b/git-revert.txt index 3d0c5ab..5411edc 100644 --- a/git-revert.txt +++ b/git-revert.txt
@@ -24,7 +24,7 @@ -e:: --edit:: - With this option, `git-revert` will let you edit the commit + With this option, 'git-revert' will let you edit the commit message prior to committing the revert. This is the default if you run the command from a terminal. @@ -37,7 +37,7 @@ relative to the specified parent. --no-edit:: - With this option, `git-revert` will not start the commit + With this option, 'git-revert' will not start the commit message editor. -n::
diff --git a/git-rm.html b/git-rm.html index 74798cb..657ccfe 100644 --- a/git-rm.html +++ b/git-rm.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-rm(1)</title> </head> @@ -272,12 +320,12 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git rm</em> [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>…</p> +<div class="para"><p><em>git rm</em> [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>…</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Remove files from the index, or from the working tree and the index. -<tt>git-rm</tt> will not remove a file from just your working directory. +<div class="para"><p>Remove files from the index, or from the working tree and the index. +<em>git-rm</em> will not remove a file from just your working directory. (There is no option to remove a file only from the work tree and yet keep it in the index; use <tt>/bin/rm</tt> if you want to do that.) The files being removed have to be identical to the tip of the branch, @@ -285,11 +333,11 @@ though that default behavior can be overridden with the <tt>-f</tt> option. When <em>--cached</em> is given, the staged content has to match either the tip of the branch or the file on disk, -allowing the file to be removed from just the index.</p> +allowing the file to be removed from just the index.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <file>… </dt> @@ -371,26 +419,26 @@ </dt> <dd> <p> - <tt>git-rm</tt> normally outputs one line (in the form of an "rm" command) + <em>git-rm</em> normally outputs one line (in the form of an "rm" command) for each file removed. This option suppresses that output. </p> </dd> -</dl> +</dl></div> </div> -<h2>DISCUSSION</h2> +<h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> -<p>The <file> list given to the command can be exact pathnames, +<div class="para"><p>The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command removes only the paths that are known to git. Giving the name of -a file that you have not told git about does not remove that file.</p> -<p>File globbing matches across directory boundaries. Thus, given +a file that you have not told git about does not remove that file.</p></div> +<div class="para"><p>File globbing matches across directory boundaries. Thus, given two directories <tt>d</tt> and <tt>d2</tt>, there is a difference between using <tt>git rm 'd*'</tt> and <tt>git rm 'd/*'</tt>, as the former will -also remove all of directory <tt>d2</tt>.</p> +also remove all of directory <tt>d2</tt>.</p></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> git rm Documentation/\*.txt </dt> @@ -399,9 +447,9 @@ Removes all <tt>*.txt</tt> files from the index that are under the <tt>Documentation</tt> directory and any of its subdirectories. </p> -<p>Note that the asterisk <tt>*</tt> is quoted from the shell in this +<div class="para"><p>Note that the asterisk <tt>*</tt> is quoted from the shell in this example; this lets git, and not the shell, expand the pathnames -of files and subdirectories under the <tt>Documentation/</tt> directory.</p> +of files and subdirectories under the <tt>Documentation/</tt> directory.</p></div> </dd> <dt> git rm -f git-*.sh @@ -413,27 +461,27 @@ does not remove <tt>subdir/git-foo.sh</tt>. </p> </dd> -</dl> +</dl></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-add.html">git-add(1)</a></p> +<div class="para"><p><a href="git-add.html">git-add(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:01 UTC +Last updated 2008-07-06 05:17:01 UTC </div> </div> </body> diff --git a/git-rm.txt b/git-rm.txt index 01b63be..4d0c495 100644 --- a/git-rm.txt +++ b/git-rm.txt
@@ -12,7 +12,7 @@ DESCRIPTION ----------- Remove files from the index, or from the working tree and the index. -`git-rm` will not remove a file from just your working directory. +'git-rm' will not remove a file from just your working directory. (There is no option to remove a file only from the work tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, @@ -63,7 +63,7 @@ -q:: --quiet:: - `git-rm` normally outputs one line (in the form of an "rm" command) + 'git-rm' normally outputs one line (in the form of an "rm" command) for each file removed. This option suppresses that output.
diff --git a/git-send-pack.html b/git-send-pack.html index 6fda2e4..6943452 100644 --- a/git-send-pack.html +++ b/git-send-pack.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-send-pack(1)</title> </head> @@ -272,24 +320,24 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git send-pack</em> [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>…]</p> +<div class="para"><p><em>git send-pack</em> [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>…]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Usually you would want to use <tt>git-push</tt>, which is a -higher-level wrapper of this command, instead. See <a href="git-push.html">git-push(1)</a>.</p> -<p>Invokes <tt>git-receive-pack</tt> on a possibly remote repository, and -updates it from the current repository, sending named refs.</p> +<div class="para"><p>Usually you would want to use <em>git-push</em>, which is a +higher-level wrapper of this command, instead. See <a href="git-push.html">git-push(1)</a>.</p></div> +<div class="para"><p>Invokes <em>git-receive-pack</em> on a possibly remote repository, and +updates it from the current repository, sending named refs.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --receive-pack=<git-receive-pack> </dt> <dd> <p> - Path to the <tt>git-receive-pack</tt> program on the remote + Path to the <em>git-receive-pack</em> program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH. @@ -355,7 +403,7 @@ <dd> <p> A remote host to house the repository. When this - part is specified, <tt>git-receive-pack</tt> is invoked via + part is specified, <em>git-receive-pack</em> is invoked via ssh. </p> </dd> @@ -375,29 +423,29 @@ The remote refs to update. </p> </dd> -</dl> +</dl></div> </div> -<h2>Specifying the Refs</h2> +<h2 id="_specifying_the_refs">Specifying the Refs</h2> <div class="sectionbody"> -<p>There are three ways to specify which refs to update on the -remote end.</p> -<p>With <em>--all</em> flag, all refs that exist locally are transferred to +<div class="para"><p>There are three ways to specify which refs to update on the +remote end.</p></div> +<div class="para"><p>With <em>--all</em> flag, all refs that exist locally are transferred to the remote side. You cannot specify any <em><ref></em> if you use -this flag.</p> -<p>Without <em>--all</em> and without any <em><ref></em>, the heads that exist -both on the local side and on the remote side are updated.</p> -<p>When one or more <em><ref></em> are specified explicitly, it can be either a +this flag.</p></div> +<div class="para"><p>Without <em>--all</em> and without any <em><ref></em>, the heads that exist +both on the local side and on the remote side are updated.</p></div> +<div class="para"><p>When one or more <em><ref></em> are specified explicitly, it can be either a single pattern, or a pair of such pattern separated by a colon ":" (this means that a ref name cannot have a colon in it). A -single pattern <em><name></em> is just a shorthand for <em><name>:<name></em>.</p> -<p>Each pattern pair consists of the source side (before the colon) +single pattern <em><name></em> is just a shorthand for <em><name>:<name></em>.</p></div> +<div class="para"><p>Each pattern pair consists of the source side (before the colon) and the destination side (after the colon). The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side. The rules used to match a ref are the same -rules used by <tt>git-rev-parse</tt> to resolve a symbolic ref -name. See <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p> -<ul> +rules used by <em>git-rev-parse</em> to resolve a symbolic ref +name. See <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p></div> +<div class="ilist"><ul> <li> <p> It is an error if <src> does not match exactly one of the @@ -413,7 +461,7 @@ <p> If <dst> does not match any remote ref, either </p> -<ul> +<div class="ilist"><ul> <li> <p> it has to start with "refs/"; <dst> is used as the @@ -427,33 +475,33 @@ locally is used as the name of the destination. </p> </li> -</ul> +</ul></div> </li> -</ul> -<p>Without <em>--force</em>, the <src> ref is stored at the remote only if +</ul></div> +<div class="para"><p>Without <em>--force</em>, the <src> ref is stored at the remote only if <dst> does not exist, or <dst> is a proper subset (i.e. an ancestor) of <src>. This check, known as "fast forward check", is performed in order to avoid accidentally overwriting the -remote ref and lose other peoples' commits from there.</p> -<p>With <em>--force</em>, the fast forward check is disabled for all refs.</p> -<p>Optionally, a <ref> parameter can be prefixed with a plus <em>+</em> sign -to disable the fast-forward check only on that ref.</p> +remote ref and lose other peoples' commits from there.</p></div> +<div class="para"><p>With <em>--force</em>, the fast forward check is disabled for all refs.</p></div> +<div class="para"><p>Optionally, a <ref> parameter can be prefixed with a plus <em>+</em> sign +to disable the fast-forward check only on that ref.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano.</p> +<div class="para"><p>Documentation by Junio C Hamano.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:02 UTC +Last updated 2008-07-06 05:17:01 UTC </div> </div> </body> diff --git a/git-send-pack.txt b/git-send-pack.txt index 410504d..3998218 100644 --- a/git-send-pack.txt +++ b/git-send-pack.txt
@@ -12,17 +12,17 @@ DESCRIPTION ----------- -Usually you would want to use `git-push`, which is a +Usually you would want to use 'git-push', which is a higher-level wrapper of this command, instead. See linkgit:git-push[1]. -Invokes `git-receive-pack` on a possibly remote repository, and +Invokes 'git-receive-pack' on a possibly remote repository, and updates it from the current repository, sending named refs. OPTIONS ------- --receive-pack=<git-receive-pack>:: - Path to the `git-receive-pack` program on the remote + Path to the 'git-receive-pack' program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH. @@ -53,7 +53,7 @@ <host>:: A remote host to house the repository. When this - part is specified, `git-receive-pack` is invoked via + part is specified, 'git-receive-pack' is invoked via ssh. <directory>:: @@ -86,7 +86,7 @@ pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side. The rules used to match a ref are the same -rules used by `git-rev-parse` to resolve a symbolic ref +rules used by 'git-rev-parse' to resolve a symbolic ref name. See linkgit:git-rev-parse[1]. - It is an error if <src> does not match exactly one of the
diff --git a/git-sh-setup.html b/git-sh-setup.html index 797b602..d7e63f7 100644 --- a/git-sh-setup.html +++ b/git-sh-setup.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-sh-setup(1)</title> </head> @@ -272,27 +320,27 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>. "$(git --exec-path)/git-sh-setup"</em></p> +<div class="para"><p><em>. "$(git --exec-path)/git-sh-setup"</em></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This is not a command the end user would want to run. Ever. +<div class="para"><p>This is not a command the end user would want to run. Ever. This documentation is meant for people who are studying the -Porcelain-ish scripts and/or are writing new ones.</p> -<p>The <tt>git-sh-setup</tt> scriptlet is designed to be sourced (using +Porcelain-ish scripts and/or are writing new ones.</p></div> +<div class="para"><p>The <em>git-sh-setup</em> scriptlet is designed to be sourced (using <tt>.</tt>) by other shell scripts to set up some variables pointing at -the normal git directories and a few helper shell functions.</p> -<p>Before sourcing it, your script should set up a few variables; +the normal git directories and a few helper shell functions.</p></div> +<div class="para"><p>Before sourcing it, your script should set up a few variables; <tt>USAGE</tt> (and <tt>LONG_USAGE</tt>, if any) is used to define message given by <tt>usage()</tt> shell function. <tt>SUBDIRECTORY_OK</tt> can be set if the script can run from a subdirectory of the working tree -(some commands do not).</p> -<p>The scriptlet sets <tt>GIT_DIR</tt> and <tt>GIT_OBJECT_DIRECTORY</tt> shell -variables, but does <strong>not</strong> export them to the environment.</p> +(some commands do not).</p></div> +<div class="para"><p>The scriptlet sets <tt>GIT_DIR</tt> and <tt>GIT_OBJECT_DIRECTORY</tt> shell +variables, but does <strong>not</strong> export them to the environment.</p></div> </div> -<h2>FUNCTIONS</h2> +<h2 id="_functions">FUNCTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> die </dt> @@ -367,23 +415,23 @@ GIT_AUTHOR_EMAIL and GIT_AUTHOR_DATE variables for a given commit. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:03 UTC +Last updated 2008-07-06 05:17:03 UTC </div> </div> </body> diff --git a/git-sh-setup.txt b/git-sh-setup.txt index 6731f9a..18f14b5 100644 --- a/git-sh-setup.txt +++ b/git-sh-setup.txt
@@ -16,7 +16,7 @@ This documentation is meant for people who are studying the Porcelain-ish scripts and/or are writing new ones. -The `git-sh-setup` scriptlet is designed to be sourced (using +The 'git-sh-setup' scriptlet is designed to be sourced (using `.`) by other shell scripts to set up some variables pointing at the normal git directories and a few helper shell functions.
diff --git a/git-shell.html b/git-shell.html index 66706cc..e50b5e3 100644 --- a/git-shell.html +++ b/git-shell.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-shell(1)</title> </head> @@ -272,33 +320,33 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>$(git --exec-path)/git-shell</em> -c <command> <argument></p> +<div class="para"><p><em>$(git --exec-path)/git-shell</em> -c <command> <argument></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This is meant to be used as a login shell for SSH accounts you want +<div class="para"><p>This is meant to be used as a login shell for SSH accounts you want to restrict to GIT pull/push access only. It permits execution only of server-side GIT commands implementing the pull/push functionality. The commands can be executed only by the <em>-c</em> option; the shell is not -interactive.</p> -<p>Currently, only the <tt>git-receive-pack</tt> and <tt>git-upload-pack</tt> commands -are permitted to be called, with a single required argument.</p> +interactive.</p></div> +<div class="para"><p>Currently, only the <em>git-receive-pack</em> and <em>git-upload-pack</em> commands +are permitted to be called, with a single required argument.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Petr Baudis and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Petr Baudis and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:02 UTC +Last updated 2008-07-06 05:17:02 UTC </div> </div> </body> diff --git a/git-shell.txt b/git-shell.txt index 9b2ae7f..ff420f8 100644 --- a/git-shell.txt +++ b/git-shell.txt
@@ -18,7 +18,7 @@ The commands can be executed only by the '-c' option; the shell is not interactive. -Currently, only the `git-receive-pack` and `git-upload-pack` commands +Currently, only the 'git-receive-pack' and 'git-upload-pack' commands are permitted to be called, with a single required argument. Author
diff --git a/git-shortlog.html b/git-shortlog.html index 4f86959..3f05061 100644 --- a/git-shortlog.html +++ b/git-shortlog.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-shortlog(1)</title> </head> @@ -266,7 +314,7 @@ <h2>NAME</h2> <div class="sectionbody"> <p>git-shortlog - - Summarize 'git log' output + Summarize 'git-log' output </p> </div> </div> @@ -276,16 +324,16 @@ <div class="content">git log --pretty=short | <em>git shortlog</em> [-h] [-n] [-s] [-e] [-w] git shortlog [-n|--numbered] [-s|--summary] [-e|--email] [-w[<width>[,<indent1>[,<indent2>]]]] [<committish>…]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Summarizes <tt>git-log</tt> output in a format suitable for inclusion +<div class="para"><p>Summarizes <em>git-log</em> output in a format suitable for inclusion in release announcements. Each commit will be grouped by author and -the first line of the commit message will be shown.</p> -<p>Additionally, "[PATCH]" will be stripped from the commit description.</p> +the first line of the commit message will be shown.</p></div> +<div class="para"><p>Additionally, "[PATCH]" will be stripped from the commit description.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -h </dt> @@ -342,14 +390,14 @@ <tt>indent1</tt>, and <tt>indent2</tt> default to 76, 6 and 9 respectively. </p> </dd> -</dl> +</dl></div> </div> -<h2>FILES</h2> +<h2 id="_files">FILES</h2> <div class="sectionbody"> -<p>If the file <tt>.mailmap</tt> exists, it will be used for mapping author +<div class="para"><p>If the file <tt>.mailmap</tt> exists, it will be used for mapping author email addresses to a real author name. One mapping per line, first the author name followed by the email address enclosed by -<em><</em> and <em>></em>. Use hash <em>#</em> for comments. Example:</p> +<em><</em> and <em>></em>. Use hash <em>#</em> for comments. Example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt># Keep alphabetized @@ -357,21 +405,21 @@ Eve Jones <eve@laptop.(none)></tt></pre> </div></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Jeff Garzik <jgarzik@pobox.com></p> +<div class="para"><p>Written by Jeff Garzik <jgarzik@pobox.com></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano.</p> +<div class="para"><p>Documentation by Junio C Hamano.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:02 UTC +Last updated 2008-07-06 05:17:02 UTC </div> </div> </body> diff --git a/git-shortlog.txt b/git-shortlog.txt index 6e4cbc4..7ccf31c 100644 --- a/git-shortlog.txt +++ b/git-shortlog.txt
@@ -3,7 +3,7 @@ NAME ---- -git-shortlog - Summarize 'git log' output +git-shortlog - Summarize 'git-log' output SYNOPSIS -------- @@ -13,7 +13,7 @@ DESCRIPTION ----------- -Summarizes `git-log` output in a format suitable for inclusion +Summarizes 'git-log' output in a format suitable for inclusion in release announcements. Each commit will be grouped by author and the first line of the commit message will be shown.
diff --git a/git-show-branch.html b/git-show-branch.html index 596ea40..d34d82f 100644 --- a/git-show-branch.html +++ b/git-show-branch.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-show-branch(1)</title> </head> @@ -278,18 +326,18 @@ [--no-name | --sha1-name] [--topics] [<rev> | <glob>]… <em>git show-branch</em> (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Shows the commit ancestry graph starting from the commits named +<div class="para"><p>Shows the commit ancestry graph starting from the commits named with <rev>s or <globs>s (or all refs under $GIT_DIR/refs/heads -and/or $GIT_DIR/refs/tags) semi-visually.</p> -<p>It cannot show more than 29 branches and commits at a time.</p> -<p>It uses <tt>showbranch.default</tt> multi-valued configuration items if -no <rev> nor <glob> is given on the command line.</p> +and/or $GIT_DIR/refs/tags) semi-visually.</p></div> +<div class="para"><p>It cannot show more than 29 branches and commits at a time.</p></div> +<div class="para"><p>It uses <tt>showbranch.default</tt> multi-valued configuration items if +no <rev> nor <glob> is given on the command line.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <rev> </dt> @@ -390,7 +438,7 @@ <dd> <p> Instead of showing the commit list, just act like the - <tt>git-merge-base -a</tt> command, except that it can accept + <em>git-merge-base -a</em> command, except that it can accept more than two heads. </p> </dd> @@ -448,24 +496,24 @@ current branch (or <tt>HEAD</tt> if it is detached). </p> </dd> -</dl> -<p>Note that --more, --list, --independent and --merge-base options -are mutually exclusive.</p> +</dl></div> +<div class="para"><p>Note that --more, --list, --independent and --merge-base options +are mutually exclusive.</p></div> </div> -<h2>OUTPUT</h2> +<h2 id="_output">OUTPUT</h2> <div class="sectionbody"> -<p>Given N <references>, the first N lines are the one-line +<div class="para"><p>Given N <references>, the first N lines are the one-line description from their commit message. The branch head that is pointed at by $GIT_DIR/HEAD is prefixed with an asterisk <tt>*</tt> -character while other heads are prefixed with a <tt>!</tt> character.</p> -<p>Following these N lines, one-line log for each commit is +character while other heads are prefixed with a <tt>!</tt> character.</p></div> +<div class="para"><p>Following these N lines, one-line log for each commit is displayed, indented N places. If a commit is on the I-th branch, the I-th indentation character shows a <tt>+</tt> sign; otherwise it shows a space. Merge commits are denoted by a <tt>-</tt> sign. Each commit shows a short name that -can be used as an extended SHA1 to name that commit.</p> -<p>The following example shows three branches, "master", "fixes" -and "mhf":</p> +can be used as an extended SHA1 to name that commit.</p></div> +<div class="para"><p>The following example shows three branches, "master", "fixes" +and "mhf":</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show-branch master fixes mhf @@ -485,16 +533,16 @@ + [mhf~8] Start adding the $GIT_DIR/remotes/ support. *++ [master] Add 'git show-branch'.</tt></pre> </div></div> -<p>These three branches all forked from a common commit, [master], +<div class="para"><p>These three branches all forked from a common commit, [master], whose commit message is "Add <em>git show-branch</em>. "fixes" branch adds one commit <em>Introduce "reset type"</em>. "mhf" branch has many -other commits. The current branch is "master".</p> +other commits. The current branch is "master".</p></div> </div> -<h2>EXAMPLE</h2> +<h2 id="_example">EXAMPLE</h2> <div class="sectionbody"> -<p>If you keep your primary branches immediately under +<div class="para"><p>If you keep your primary branches immediately under <tt>$GIT_DIR/refs/heads</tt>, and topic branches in subdirectories of -it, having the following in the configuration file may help:</p> +it, having the following in the configuration file may help:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[showbranch] @@ -502,32 +550,32 @@ default = heads/* </tt></pre> </div></div> -<p>With this, <tt>git show-branch</tt> without extra parameters would show +<div class="para"><p>With this, <tt>git show-branch</tt> without extra parameters would show only the primary branches. In addition, if you happen to be on -your topic branch, it is shown as well.</p> +your topic branch, it is shown as well.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show-branch --reflog='10,1 hour ago' --list master</tt></pre> </div></div> -<p>shows 10 reflog entries going back from the tip as of 1 hour ago. +<div class="para"><p>shows 10 reflog entries going back from the tip as of 1 hour ago. Without <tt>--list</tt>, the output also shows how these tips are -topologically related with each other.</p> +topologically related with each other.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano.</p> +<div class="para"><p>Documentation by Junio C Hamano.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:02 UTC +Last updated 2008-07-06 05:17:02 UTC </div> </div> </body> diff --git a/git-show-branch.txt b/git-show-branch.txt index 578bdb7..14e1036 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt
@@ -75,7 +75,7 @@ --merge-base:: Instead of showing the commit list, just act like the - `git-merge-base -a` command, except that it can accept + 'git-merge-base -a' command, except that it can accept more than two heads. --independent::
diff --git a/git-show-index.html b/git-show-index.html index 29ff107..c9bac2f 100644 --- a/git-show-index.html +++ b/git-show-index.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-show-index(1)</title> </head> @@ -272,31 +320,31 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git show-index</em> < idx-file</p> +<div class="para"><p><em>git show-index</em> < idx-file</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Reads given idx file for packed git archive created with -<tt>git-pack-objects</tt> command, and dumps its contents.</p> -<p>The information it outputs is subset of what you can get from -<tt>git-verify-pack -v</tt>; this command only shows the packfile -offset and SHA1 of each object.</p> +<div class="para"><p>Reads given idx file for packed git archive created with +<em>git-pack-objects</em> command, and dumps its contents.</p></div> +<div class="para"><p>The information it outputs is subset of what you can get from +<em>git-verify-pack -v</em>; this command only shows the packfile +offset and SHA1 of each object.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano</p> +<div class="para"><p>Documentation by Junio C Hamano</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:02 UTC +Last updated 2008-07-06 05:17:02 UTC </div> </div> </body> diff --git a/git-show-index.txt b/git-show-index.txt index 4ae6ede..e3285aa 100644 --- a/git-show-index.txt +++ b/git-show-index.txt
@@ -14,10 +14,10 @@ DESCRIPTION ----------- Reads given idx file for packed git archive created with -`git-pack-objects` command, and dumps its contents. +'git-pack-objects' command, and dumps its contents. The information it outputs is subset of what you can get from -`git-verify-pack -v`; this command only shows the packfile +'git-verify-pack -v'; this command only shows the packfile offset and SHA1 of each object.
diff --git a/git-show-ref.html b/git-show-ref.html index dffd3ed..e33bf36 100644 --- a/git-show-ref.html +++ b/git-show-ref.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-show-ref(1)</title> </head> @@ -277,20 +325,20 @@ [-s|--hash] [--abbrev] [--tags] [--heads] [--] <pattern>… <em>git show-ref</em> --exclude-existing[=pattern]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Displays references available in a local repository along with the associated +<div class="para"><p>Displays references available in a local repository along with the associated commit IDs. Results can be filtered using a pattern and tags can be dereferenced into object IDs. Additionally, it can be used to test whether a -particular ref exists.</p> -<p>The --exclude-existing form is a filter that does the inverse, it shows the -refs from stdin that don't exist in the local repository.</p> -<p>Use of this utility is encouraged in favor of directly accessing files under -in the <tt>.git</tt> directory.</p> +particular ref exists.</p></div> +<div class="para"><p>The --exclude-existing form is a filter that does the inverse, it shows the +refs from stdin that don't exist in the local repository.</p></div> +<div class="para"><p>Use of this utility is encouraged in favor of directly accessing files under +in the <tt>.git</tt> directory.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -h </dt> @@ -381,7 +429,7 @@ </dt> <dd> <p> - Make <tt>git-show-ref</tt> act as a filter that reads refs from stdin of the + Make <em>git-show-ref</em> act as a filter that reads refs from stdin of the form "<sup>(?:<anything>\s)?<refname>(?:\</sup>{})?$" and performs the following actions on each: (1) strip "^{}" at the end of line if any; @@ -399,11 +447,11 @@ Show references matching one or more patterns. </p> </dd> -</dl> +</dl></div> </div> -<h2>OUTPUT</h2> +<h2 id="_output">OUTPUT</h2> <div class="sectionbody"> -<p>The output is in the format: <em><SHA-1 ID></em> <em><space></em> <em><reference name></em>.</p> +<div class="para"><p>The output is in the format: <em><SHA-1 ID></em> <em><space></em> <em><reference name></em>.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show-ref --head --dereference @@ -416,7 +464,7 @@ 423325a2d24638ddcc82ce47be5e40be550f4507 refs/tags/v1.0rc4^{} ...</tt></pre> </div></div> -<p>When using --hash (and not --dereference) the output format is: <em><SHA-1 ID></em></p> +<div class="para"><p>When using --hash (and not --dereference) the output format is: <em><SHA-1 ID></em></p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show-ref --heads --hash @@ -426,62 +474,62 @@ ...</tt></pre> </div></div> </div> -<h2>EXAMPLE</h2> +<h2 id="_example">EXAMPLE</h2> <div class="sectionbody"> -<p>To show all references called "master", whether tags or heads or anything +<div class="para"><p>To show all references called "master", whether tags or heads or anything else, and regardless of how deep in the reference naming hierarchy they are, -use:</p> +use:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> git show-ref master</tt></pre> </div></div> -<p>This will show "refs/heads/master" but also "refs/remote/other-repo/master", -if such references exists.</p> -<p>When using the <em>--verify</em> flag, the command requires an exact path:</p> +<div class="para"><p>This will show "refs/heads/master" but also "refs/remote/other-repo/master", +if such references exists.</p></div> +<div class="para"><p>When using the <em>--verify</em> flag, the command requires an exact path:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> git show-ref --verify refs/heads/master</tt></pre> </div></div> -<p>will only match the exact branch called "master".</p> -<p>If nothing matches, <tt>git-show-ref</tt> will return an error code of 1, -and in the case of verification, it will show an error message.</p> -<p>For scripting, you can ask it to be quiet with the "--quiet" flag, which -allows you to do things like</p> +<div class="para"><p>will only match the exact branch called "master".</p></div> +<div class="para"><p>If nothing matches, <em>git-show-ref</em> will return an error code of 1, +and in the case of verification, it will show an error message.</p></div> +<div class="para"><p>For scripting, you can ask it to be quiet with the "--quiet" flag, which +allows you to do things like</p></div> <div class="listingblock"> <div class="content"> <pre><tt> git show-ref --quiet --verify -- "refs/heads/$headname" || echo "$headname is not a valid branch"</tt></pre> </div></div> -<p>to check whether a particular branch exists or not (notice how we don't +<div class="para"><p>to check whether a particular branch exists or not (notice how we don't actually want to show any results, and we want to use the full refname for it -in order to not trigger the problem with ambiguous partial matches).</p> -<p>To show only tags, or only proper branch heads, use "--tags" and/or "--heads" +in order to not trigger the problem with ambiguous partial matches).</p></div> +<div class="para"><p>To show only tags, or only proper branch heads, use "--tags" and/or "--heads" respectively (using both means that it shows tags and heads, but not other -random references under the refs/ subdirectory).</p> -<p>To do automatic tag object dereferencing, use the "-d" or "--dereference" -flag, so you can do</p> +random references under the refs/ subdirectory).</p></div> +<div class="para"><p>To do automatic tag object dereferencing, use the "-d" or "--dereference" +flag, so you can do</p></div> <div class="listingblock"> <div class="content"> <pre><tt> git show-ref --tags --dereference</tt></pre> </div></div> -<p>to get a listing of all tags together with what they dereference.</p> +<div class="para"><p>to get a listing of all tags together with what they dereference.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-ls-remote.html">git-ls-remote(1)</a></p> +<div class="para"><p><a href="git-ls-remote.html">git-ls-remote(1)</a></p></div> </div> -<h2>AUTHORS</h2> +<h2 id="_authors">AUTHORS</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org>. -Man page by Jonas Fonseca <fonseca@diku.dk>.</p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>. +Man page by Jonas Fonseca <fonseca@diku.dk>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:03 UTC +Last updated 2008-07-06 05:17:03 UTC </div> </div> </body> diff --git a/git-show-ref.txt b/git-show-ref.txt index a78a7dc..9a43899 100644 --- a/git-show-ref.txt +++ b/git-show-ref.txt
@@ -74,7 +74,7 @@ --exclude-existing:: --exclude-existing=pattern:: - Make `git-show-ref` act as a filter that reads refs from stdin of the + Make 'git-show-ref' act as a filter that reads refs from stdin of the form "^(?:<anything>\s)?<refname>(?:\^\{\})?$" and performs the following actions on each: (1) strip "^{}" at the end of line if any; @@ -137,7 +137,7 @@ will only match the exact branch called "master". -If nothing matches, `git-show-ref` will return an error code of 1, +If nothing matches, 'git-show-ref' will return an error code of 1, and in the case of verification, it will show an error message. For scripting, you can ask it to be quiet with the "--quiet" flag, which diff --git a/git-show.html b/git-show.html index 6f69343..ac2d52e 100644 --- a/git-show.html +++ b/git-show.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-show(1)</title> </head> @@ -272,25 +320,25 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git show</em> [options] <object>…</p> +<div class="para"><p><em>git show</em> [options] <object>…</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Shows one or more objects (blobs, trees, tags and commits).</p> -<p>For commits it shows the log message and textual diff. It also +<div class="para"><p>Shows one or more objects (blobs, trees, tags and commits).</p></div> +<div class="para"><p>For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by -<tt>git-diff-tree --cc</tt>.</p> -<p>For tags, it shows the tag message and the referenced objects.</p> -<p>For trees, it shows the names (equivalent to <tt>git-ls-tree</tt> -with --name-only).</p> -<p>For plain blobs, it shows the plain contents.</p> -<p>The command takes options applicable to the <tt>git-diff-tree</tt> command to -control how the changes the commit introduces are shown.</p> -<p>This manual page describes only the most frequently used options.</p> +<em>git-diff-tree --cc</em>.</p></div> +<div class="para"><p>For tags, it shows the tag message and the referenced objects.</p></div> +<div class="para"><p>For trees, it shows the names (equivalent to <em>git-ls-tree</em> +with --name-only).</p></div> +<div class="para"><p>For plain blobs, it shows the plain contents.</p></div> +<div class="para"><p>The command takes options applicable to the <em>git-diff-tree</em> command to +control how the changes the commit introduces are shown.</p></div> +<div class="para"><p>This manual page describes only the most frequently used options.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <object> </dt> @@ -311,8 +359,8 @@ <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. When omitted, the format defaults to <em>medium</em>. </p> -<p>Note: you can specify the default pretty format in the repository -configuration (see <a href="git-config.html">git-config(1)</a>).</p> +<div class="para"><p>Note: you can specify the default pretty format in the repository +configuration (see <a href="git-config.html">git-config(1)</a>).</p></div> </dd> <dt> --abbrev-commit @@ -324,8 +372,8 @@ digits can be specified with "--abbrev=<n>" (which also modifies diff output, if it is displayed). </p> -<p>This should make "--pretty=oneline" a whole lot more readable for -people using 80-column terminals.</p> +<div class="para"><p>This should make "--pretty=oneline" a whole lot more readable for +people using 80-column terminals.</p></div> </dd> <dt> --encoding[=<encoding>] @@ -339,11 +387,11 @@ defaults to UTF-8. </p> </dd> -</dl> +</dl></div> </div> -<h2>PRETTY FORMATS</h2> +<h2 id="_pretty_formats">PRETTY FORMATS</h2> <div class="sectionbody"> -<p>If the commit is a merge, and if the pretty-format +<div class="para"><p>If the commit is a merge, and if the pretty-format is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is inserted before the <em>Author:</em> line. This line begins with "Merge: " and the sha1s of ancestral commits are printed, @@ -351,9 +399,9 @@ necessarily be the list of the <strong>direct</strong> parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or -file.</p> -<p>Here are some additional details for each format:</p> -<ul> +file.</p></div> +<div class="para"><p>Here are some additional details for each format:</p></div> +<div class="ilist"><ul> <li> <p> <em>oneline</em> @@ -362,7 +410,7 @@ <div class="content"> <pre><tt><sha1> <title line></tt></pre> </div></div> -<p>This is designed to be as compact as possible.</p> +<div class="para"><p>This is designed to be as compact as possible.</p></div> </li> <li> <p> @@ -386,7 +434,7 @@ <div class="content"> <pre><tt>commit <sha1> Author: <author> -Date: <date></tt></pre> +Date: <author date></tt></pre> </div></div> <div class="literalblock"> <div class="content"> @@ -424,9 +472,9 @@ <div class="content"> <pre><tt>commit <sha1> Author: <author> -AuthorDate: <date & time> +AuthorDate: <author date> Commit: <committer> -CommitDate: <date & time></tt></pre> +CommitDate: <committer date></tt></pre> </div></div> <div class="literalblock"> <div class="content"> @@ -445,7 +493,7 @@ <div class="content"> <pre><tt>From <sha1> <date> From: <author> -Date: <date & time> +Date: <author date> Subject: [PATCH] <title line></tt></pre> </div></div> <div class="literalblock"> @@ -457,31 +505,31 @@ <p> <em>raw</em> </p> -<p>The <em>raw</em> format shows the entire commit exactly as +<div class="para"><p>The <em>raw</em> format shows the entire commit exactly as stored in the commit object. Notably, the SHA1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the true parent commits, without taking grafts nor history -simplification into account.</p> +simplification into account.</p></div> </li> <li> <p> <em>format:</em> </p> -<p>The <em>format:</em> format allows you to specify which information +<div class="para"><p>The <em>format:</em> format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with <em>%n</em> -instead of <em>\n</em>.</p> -<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em> -would show something like this:</p> +instead of <em>\n</em>.</p></div> +<div class="para"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em> +would show something like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago The title was >>t4119: test autocomputing -p<n> for traditional diff input.<< </tt></pre> </div></div> -<p>The placeholders are:</p> -<ul> +<div class="para"><p>The placeholders are:</p></div> +<div class="ilist"><ul> <li> <p> <em>%H</em>: commit hash @@ -632,19 +680,19 @@ <em>%x00</em>: print a byte from a hex code </p> </li> -</ul> +</ul></div> </li> <li> <p> <em>tformat:</em> </p> -<p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it +<div class="para"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it provides "terminator" semantics instead of "separator" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the "oneline" format does. -For example:</p> +For example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log -2 --pretty=format:%h 4da45bef \ @@ -658,11 +706,11 @@ 7134973</tt></pre> </div></div> </li> -</ul> +</ul></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> git show v1.0.0 </dt> @@ -699,12 +747,12 @@ of the branch <tt>master</tt>. </p> </dd> -</dl> +</dl></div> </div> -<h2>Discussion</h2> +<h2 id="_discussion">Discussion</h2> <div class="sectionbody"> -<p>At the core level, git is character encoding agnostic.</p> -<ul> +<div class="para"><p>At the core level, git is character encoding agnostic.</p></div> +<div class="ilist"><ul> <li> <p> The pathnames recorded in the index and in the tree objects @@ -728,17 +776,17 @@ bytes. </p> </li> -</ul> -<p>Although we encourage that the commit log messages are encoded +</ul></div> +<div class="para"><p>Although we encourage that the commit log messages are encoded in UTF-8, both the core and git Porcelain are designed not to force UTF-8 on projects. If all participants of a particular project find it more convenient to use legacy encodings, git does not forbid it. However, there are a few things to keep in -mind.</p> -<ol> +mind.</p></div> +<div class="olist"><ol> <li> <p> -<tt>git-commit-tree</tt> (hence, <tt>git-commit</tt> which uses it) issues +<em>git-commit-tree</em> (hence, <em>git-commit</em> which uses it) issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to @@ -749,14 +797,14 @@ <pre><tt>[i18n] commitencoding = ISO-8859-1</tt></pre> </div></div> -<p>Commit objects created with the above setting record the value +<div class="para"><p>Commit objects created with the above setting record the value of <tt>i18n.commitencoding</tt> in its <tt>encoding</tt> header. This is to help other people who look at them later. Lack of this header -implies that the commit log message is encoded in UTF-8.</p> +implies that the commit log message is encoded in UTF-8.</p></div> </li> <li> <p> -<tt>git-log</tt>, <tt>git-show</tt> and friends looks at the <tt>encoding</tt> +<em>git-log</em>, <em>git-show</em> and friends looks at the <tt>encoding</tt> header of a commit object, and tries to re-code the log message into UTF-8 unless otherwise specified. You can specify the desired output encoding with @@ -767,32 +815,32 @@ <pre><tt>[i18n] logoutputencoding = ISO-8859-1</tt></pre> </div></div> -<p>If you do not have this configuration variable, the value of -<tt>i18n.commitencoding</tt> is used instead.</p> +<div class="para"><p>If you do not have this configuration variable, the value of +<tt>i18n.commitencoding</tt> is used instead.</p></div> </li> -</ol> -<p>Note that we deliberately chose not to re-code the commit log +</ol></div> +<div class="para"><p>Note that we deliberately chose not to re-code the commit log message when a commit is made to force UTF-8 at the commit object level, because re-coding to UTF-8 is not necessarily a -reversible operation.</p> +reversible operation.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org> and +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>. Significantly enhanced by -Johannes Schindelin <Johannes.Schindelin@gmx.de>.</p> +Johannes Schindelin <Johannes.Schindelin@gmx.de>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Petr Baudis and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Petr Baudis and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:03 UTC +Last updated 2008-07-06 05:17:03 UTC </div> </div> </body> diff --git a/git-show.txt b/git-show.txt index 70b54ae..e0b52bc 100644 --- a/git-show.txt +++ b/git-show.txt
@@ -16,16 +16,16 @@ For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by -`git-diff-tree --cc`. +'git-diff-tree --cc'. For tags, it shows the tag message and the referenced objects. -For trees, it shows the names (equivalent to `git-ls-tree` +For trees, it shows the names (equivalent to 'git-ls-tree' with \--name-only). For plain blobs, it shows the plain contents. -The command takes options applicable to the `git-diff-tree` command to +The command takes options applicable to the 'git-diff-tree' command to control how the changes the commit introduces are shown. This manual page describes only the most frequently used options.
diff --git a/git-stash.html b/git-stash.html index ccc71e4..97aa37e 100644 --- a/git-stash.html +++ b/git-stash.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-stash(1)</title> </head> @@ -276,28 +324,28 @@ <div class="content"><em>git stash</em> (list | show [<stash>] | apply [<stash>] | clear | drop [<stash>] | pop [<stash>]) <em>git stash</em> [save [<message>]]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Use <em>git stash</em> when you want to record the current state of the +<div class="para"><p>Use <em>git stash</em> when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away -and reverts the working directory to match the <tt>HEAD</tt> commit.</p> -<p>The modifications stashed away by this command can be listed with +and reverts the working directory to match the <tt>HEAD</tt> commit.</p></div> +<div class="para"><p>The modifications stashed away by this command can be listed with <tt>git stash list</tt>, inspected with <tt>git stash show</tt>, and restored (potentially on top of a different commit) with <tt>git stash apply</tt>. Calling <tt>git stash</tt> without any arguments is equivalent to <tt>git stash save</tt>. A stash is by default listed as "WIP on <em>branchname</em> …", but you can give a more descriptive message on the command line when -you create one.</p> -<p>The latest stash you created is stored in <tt>$GIT_DIR/refs/stash</tt>; older +you create one.</p></div> +<div class="para"><p>The latest stash you created is stored in <tt>$GIT_DIR/refs/stash</tt>; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. <tt>stash@{0}</tt> is the most recently created stash, <tt>stash@{1}</tt> is the one before it, <tt>stash@{2.hours.ago}</tt> -is also possible).</p> +is also possible).</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> save [<message>] </dt> @@ -325,8 +373,8 @@ <pre><tt>stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation stash@{1}: On master: 9cc0589... Add git-stash</tt></pre> </div></div> -<p>The command takes options applicable to the <tt>git-log</tt> -command to control what is shown and how. See <a href="git-log.html">git-log(1)</a>.</p> +<div class="para"><p>The command takes options applicable to the <em>git-log</em> +command to control what is shown and how. See <a href="git-log.html">git-log(1)</a>.</p></div> </dd> <dt> show [<stash>] @@ -336,7 +384,7 @@ Show the changes recorded in the stash as a diff between the stashed state and its original parent. When no <tt><stash></tt> is given, shows the latest one. By default, the command shows the diffstat, but - it will accept any format known to <tt>git-diff</tt> (e.g., <tt>git stash show + it will accept any format known to <em>git-diff</em> (e.g., <tt>git stash show -p stash@{1}</tt> to view the second most recent stash in patch form). </p> </dd> @@ -349,12 +397,12 @@ working tree state. When no <tt><stash></tt> is given, applies the latest one. The working directory must match the index. </p> -<p>This operation can fail with conflicts; you need to resolve them -by hand in the working tree.</p> -<p>If the <tt>--index</tt> option is used, then tries to reinstate not only the working +<div class="para"><p>This operation can fail with conflicts; you need to resolve them +by hand in the working tree.</p></div> +<div class="para"><p>If the <tt>--index</tt> option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no -longer apply the changes as they were originally).</p> +longer apply the changes as they were originally).</p></div> </dd> <dt> clear @@ -384,28 +432,28 @@ <tt>stash@{0}</tt> is assumed. See also <tt>apply</tt>. </p> </dd> -</dl> +</dl></div> </div> -<h2>DISCUSSION</h2> +<h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> -<p>A stash is represented as a commit whose tree records the state of the +<div class="para"><p>A stash is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at <tt>HEAD</tt> when the stash was created. The tree of the second parent records the state of the index when the stash is made, and it is made a child of -the <tt>HEAD</tt> commit. The ancestry graph looks like this:</p> +the <tt>HEAD</tt> commit. The ancestry graph looks like this:</p></div> <div class="literalblock"> <div class="content"> <pre><tt> .----W / / -----H----I</tt></pre> </div></div> -<p>where <tt>H</tt> is the <tt>HEAD</tt> commit, <tt>I</tt> is a commit that records the state +<div class="para"><p>where <tt>H</tt> is the <tt>HEAD</tt> commit, <tt>I</tt> is a commit that records the state of the index, and <tt>W</tt> is a commit that records the state of the working -tree.</p> +tree.</p></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> Pulling into a dirty tree </dt> @@ -416,10 +464,10 @@ doing. When your local changes do not conflict with the changes in the upstream, a simple <tt>git pull</tt> will let you move forward. </p> -<p>However, there are cases in which your local changes do conflict with +<div class="para"><p>However, there are cases in which your local changes do conflict with the upstream changes, and <tt>git pull</tt> refuses to overwrite your changes. In such a case, you can stash your changes away, -perform a pull, and then unstash, like this:</p> +perform a pull, and then unstash, like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git pull @@ -452,7 +500,7 @@ $ git reset --soft HEAD^ ... continue hacking ...</tt></pre> </div></div> -<p>You can use <tt>git-stash</tt> to simplify the above, like this:</p> +<div class="para"><p>You can use <em>git-stash</em> to simplify the above, like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>... hack hack hack ... @@ -463,26 +511,26 @@ ... continue hacking ...</tt></pre> </div></div> </dd> -</dl> +</dl></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-checkout.html">git-checkout(1)</a>, +<div class="para"><p><a href="git-checkout.html">git-checkout(1)</a>, <a href="git-commit.html">git-commit(1)</a>, <a href="git-reflog.html">git-reflog(1)</a>, -<a href="git-reset.html">git-reset(1)</a></p> +<a href="git-reset.html">git-reset(1)</a></p></div> </div> -<h2>AUTHOR</h2> +<h2 id="_author">AUTHOR</h2> <div class="sectionbody"> -<p>Written by Nanako Shiraishi <nanako3@bluebottle.com></p> +<div class="para"><p>Written by Nanako Shiraishi <nanako3@bluebottle.com></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:03 UTC +Last updated 2008-07-06 05:17:03 UTC </div> </div> </body> diff --git a/git-stash.txt b/git-stash.txt index 23ac331..9b6b911 100644 --- a/git-stash.txt +++ b/git-stash.txt
@@ -56,7 +56,7 @@ stash@{1}: On master: 9cc0589... Add git-stash ---------------------------------------------------------------- + -The command takes options applicable to the `git-log` +The command takes options applicable to the 'git-log' command to control what is shown and how. See linkgit:git-log[1]. show [<stash>]:: @@ -64,7 +64,7 @@ Show the changes recorded in the stash as a diff between the stashed state and its original parent. When no `<stash>` is given, shows the latest one. By default, the command shows the diffstat, but - it will accept any format known to `git-diff` (e.g., `git stash show + it will accept any format known to 'git-diff' (e.g., `git stash show -p stash@\{1}` to view the second most recent stash in patch form). apply [--index] [<stash>]:: @@ -158,7 +158,7 @@ ... continue hacking ... ---------------------------------------------------------------- + -You can use `git-stash` to simplify the above, like this: +You can use 'git-stash' to simplify the above, like this: + ---------------------------------------------------------------- ... hack hack hack ... diff --git a/git-status.html b/git-status.html index 35677f9..ecbed67 100644 --- a/git-status.html +++ b/git-status.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-status(1)</title> </head> @@ -272,67 +320,67 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git status</em> <options>…</p> +<div class="para"><p><em>git status</em> <options>…</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Displays paths that have differences between the index file and the +<div class="para"><p>Displays paths that have differences between the index file and the current HEAD commit, paths that have differences between the working tree and the index file, and paths in the working tree that are not tracked by git (and are not ignored by <a href="gitignore.html">gitignore(5)</a>). The first -are what you _would_ commit by running <tt>git commit</tt>; the second and -third are what you _could_ commit by running <tt>git-add</tt> before running -<tt>git commit</tt>.</p> -<p>The command takes the same set of options as <tt>git-commit</tt>; it +are what you <em>would</em> commit by running <tt>git commit</tt>; the second and +third are what you <em>could</em> commit by running <em>git-add</em> before running +<tt>git commit</tt>.</p></div> +<div class="para"><p>The command takes the same set of options as <em>git-commit</em>; it shows what would be committed if the same options are given to -<tt>git-commit</tt>.</p> -<p>If there is no path that is different between the index file and +<em>git-commit</em>.</p></div> +<div class="para"><p>If there is no path that is different between the index file and the current HEAD commit (i.e., there is nothing to commit by running -<tt>git commit</tt>), the command exits with non-zero status.</p> +<tt>git commit</tt>), the command exits with non-zero status.</p></div> </div> -<h2>OUTPUT</h2> +<h2 id="_output">OUTPUT</h2> <div class="sectionbody"> -<p>The output from this command is designed to be used as a commit -template comment, and all the output lines are prefixed with <em>#</em>.</p> -<p>The paths mentioned in the output, unlike many other git commands, are +<div class="para"><p>The output from this command is designed to be used as a commit +template comment, and all the output lines are prefixed with <em>#</em>.</p></div> +<div class="para"><p>The paths mentioned in the output, unlike many other git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See -the status.relativePaths config option below.</p> +the status.relativePaths config option below.</p></div> </div> -<h2>CONFIGURATION</h2> +<h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<p>The command honors <tt>color.status</tt> (or <tt>status.color</tt> — they +<div class="para"><p>The command honors <tt>color.status</tt> (or <tt>status.color</tt> — they mean the same thing and the latter is kept for backward compatibility) and <tt>color.status.<slot></tt> configuration variables -to colorize its output.</p> -<p>If the config variable <tt>status.relativePaths</tt> is set to false, then all +to colorize its output.</p></div> +<div class="para"><p>If the config variable <tt>status.relativePaths</tt> is set to false, then all paths shown are relative to the repository root, not to the current -directory.</p> -<p>If <tt>status.submodulesummary</tt> is set to a non zero number or true (identical +directory.</p></div> +<div class="para"><p>If <tt>status.submodulesummary</tt> is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled and a summary of commits for modified submodules will be shown (see --summary-limit -option of <a href="git-submodule.html">git-submodule(1)</a>).</p> +option of <a href="git-submodule.html">git-submodule(1)</a>).</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="gitignore.html">gitignore(5)</a></p> +<div class="para"><p><a href="gitignore.html">gitignore(5)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net>.</p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and +Junio C Hamano <junkio@cox.net>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:04 UTC +Last updated 2008-07-06 05:17:04 UTC </div> </div> </body> diff --git a/git-status.txt b/git-status.txt index c9d4a04..57b7498 100644 --- a/git-status.txt +++ b/git-status.txt
@@ -17,12 +17,12 @@ tree and the index file, and paths in the working tree that are not tracked by git (and are not ignored by linkgit:gitignore[5]). The first are what you _would_ commit by running `git commit`; the second and -third are what you _could_ commit by running `git-add` before running +third are what you _could_ commit by running 'git-add' before running `git commit`. -The command takes the same set of options as `git-commit`; it +The command takes the same set of options as 'git-commit'; it shows what would be committed if the same options are given to -`git-commit`. +'git-commit'. If there is no path that is different between the index file and the current HEAD commit (i.e., there is nothing to commit by running
diff --git a/git-submodule.html b/git-submodule.html index 8c5a621..a222a7e 100644 --- a/git-submodule.html +++ b/git-submodule.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-submodule(1)</title> </head> @@ -279,9 +327,9 @@ <em>git submodule</em> [--quiet] update [--init] [--] [<path>…] <em>git submodule</em> [--quiet] summary [--summary-limit <n>] [commit] [--] [<path>…]</div></div> </div> -<h2>COMMANDS</h2> +<h2 id="_commands">COMMANDS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> add </dt> @@ -305,11 +353,11 @@ <p> Show the status of the submodules. This will print the SHA-1 of the currently checked out commit for each submodule, along with the - submodule path and the output of <tt>git-describe</tt> for the + submodule path and the output of <em>git-describe</em> for the SHA-1. Each SHA-1 will be prefixed with <tt>-</tt> if the submodule is not initialized and <tt>+</tt> if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing - repository. This command is the default command for <tt>git-submodule</tt>. + repository. This command is the default command for <em>git-submodule</em>. </p> </dd> <dt> @@ -332,9 +380,9 @@ checkout the commit specified in the index of the containing repository. This will make the submodules HEAD be detached. </p> -<p>If the submodule is not yet initialized, and you just want to use the +<div class="para"><p>If the submodule is not yet initialized, and you just want to use the setting as stored in .gitmodules, you can automatically initialize the -submodule with the --init option.</p> +submodule with the --init option.</p></div> </dd> <dt> summary @@ -347,11 +395,11 @@ index or working tree (switched by --cached) are shown. </p> </dd> -</dl> +</dl></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -q </dt> @@ -408,27 +456,27 @@ to only operate on the submodules found at the specified paths. </p> </dd> -</dl> +</dl></div> </div> -<h2>FILES</h2> +<h2 id="_files">FILES</h2> <div class="sectionbody"> -<p>When initializing submodules, a .gitmodules file in the top-level directory +<div class="para"><p>When initializing submodules, a .gitmodules file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as <tt>$GIT_DIR/config</tt>. The key to each submodule url is "submodule.$name.url". See <a href="gitmodules.html">gitmodules(5)</a> -for details.</p> +for details.</p></div> </div> -<h2>AUTHOR</h2> +<h2 id="_author">AUTHOR</h2> <div class="sectionbody"> -<p>Written by Lars Hjemli <hjemli@gmail.com></p> +<div class="para"><p>Written by Lars Hjemli <hjemli@gmail.com></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:04 UTC +Last updated 2008-07-06 05:17:04 UTC </div> </div> </body> diff --git a/git-submodule.txt b/git-submodule.txt index 9c4052c..105fc2d 100644 --- a/git-submodule.txt +++ b/git-submodule.txt
@@ -32,11 +32,11 @@ status:: Show the status of the submodules. This will print the SHA-1 of the currently checked out commit for each submodule, along with the - submodule path and the output of `git-describe` for the + submodule path and the output of 'git-describe' for the SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not initialized and `+` if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing - repository. This command is the default command for `git-submodule`. + repository. This command is the default command for 'git-submodule'. init:: Initialize the submodules, i.e. register in .git/config each submodule
diff --git a/git-svn.html b/git-svn.html index 6c56d7d..a740b8a 100644 --- a/git-svn.html +++ b/git-svn.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-svn(1)</title> </head> @@ -272,39 +320,39 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git svn</em> <command> [options] [arguments]</p> +<div class="para"><p><em>git svn</em> <command> [options] [arguments]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p><tt>git-svn</tt> is a simple conduit for changesets between Subversion and git. +<div class="para"><p><em>git-svn</em> is a simple conduit for changesets between Subversion and git. It is not to be confused with <a href="git-svnimport.html">git-svnimport(1)</a>, which is -read-only.</p> -<p><tt>git-svn</tt> was originally designed for an individual developer who wants a +read-only.</p></div> +<div class="para"><p><em>git-svn</em> was originally designed for an individual developer who wants a bidirectional flow of changesets between a single branch in Subversion and an arbitrary number of branches in git. Since its inception, -<tt>git-svn</tt> has gained the ability to track multiple branches in a manner -similar to <tt>git-svnimport</tt>.</p> -<p><tt>git-svn</tt> is especially useful when it comes to tracking repositories +<em>git-svn</em> has gained the ability to track multiple branches in a manner +similar to <em>git-svnimport</em>.</p></div> +<div class="para"><p><em>git-svn</em> is especially useful when it comes to tracking repositories not organized in the way Subversion developers recommend (trunk, -branches, tags directories).</p> +branches, tags directories).</p></div> </div> -<h2>COMMANDS</h2> +<h2 id="_commands">COMMANDS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <em>init</em> </dt> <dd> <p> Initializes an empty git repository with additional - metadata directories for <tt>git-svn</tt>. The Subversion URL + metadata directories for <em>git-svn</em>. The Subversion URL may be specified as a command-line argument, or as full URL arguments to -T/-t/-b. Optionally, the target directory to operate on can be specified as a second argument. Normally this command initializes the current directory. </p> -<dl> +<div class="vlist"><dl> <dt> -T<trunk_subdir> </dt> @@ -420,7 +468,7 @@ projects that share a common repository. </p> </dd> -</dl> +</dl></div> </dd> <dt> <em>fetch</em> @@ -457,15 +505,15 @@ This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it. </p> -<p>This works similarly to <tt>svn update</tt> or <tt>git-pull</tt> except that -it preserves linear history with <tt>git-rebase</tt> instead of -<tt>git-merge</tt> for ease of dcommiting with <tt>git-svn</tt>.</p> -<p>This accepts all options that <tt>git-svn fetch</tt> and <tt>git-rebase</tt> +<div class="para"><p>This works similarly to <tt>svn update</tt> or <em>git-pull</em> except that +it preserves linear history with <em>git-rebase</em> instead of +<em>git-merge</em> for ease of dcommiting with <em>git-svn</em>.</p></div> +<div class="para"><p>This accepts all options that <em>git-svn fetch</em> and <em>git-rebase</em> accept. However, <em>--fetch-all</em> only fetches from the current -[svn-remote], and not all [svn-remote] definitions.</p> -<p>Like <tt>git-rebase</tt>; this requires that the working tree be clean -and have no uncommitted changes.</p> -<dl> +[svn-remote], and not all [svn-remote] definitions.</p></div> +<div class="para"><p>Like <em>git-rebase</em>; this requires that the working tree be clean +and have no uncommitted changes.</p></div> +<div class="vlist"><dl> <dt> -l </dt> @@ -474,11 +522,11 @@ </dt> <dd> <p> - Do not fetch remotely; only run <tt>git-rebase</tt> against the + Do not fetch remotely; only run <em>git-rebase</em> against the last fetched commit from the upstream SVN. </p> </dd> -</dl> +</dl></div> </dd> <dt> <em>dcommit</em> @@ -489,7 +537,7 @@ repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in git. - It is recommended that you run <tt>git-svn</tt> fetch and rebase (not + It is recommended that you run <em>git-svn</em> fetch and rebase (not pull or merge) your commits against the latest changes in the SVN repository. An optional command-line argument may be specified as an @@ -497,7 +545,7 @@ This is advantageous over <em>set-tree</em> (below) because it produces cleaner, more linear history.<br /> </p> -<dl> +<div class="vlist"><dl> <dt> --no-rebase </dt> @@ -506,10 +554,10 @@ After committing, do not rebase or reset. </p> </dd> -</dl> +</dl></div> </dd> -</dl> -<dl> +</dl></div> +<div class="vlist"><dl> <dt> <em>log</em> </dt> @@ -518,8 +566,8 @@ This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers. </p> -<p>The following features from `svn log' are supported:</p> -<dl> +<div class="para"><p>The following features from `svn log' are supported:</p></div> +<div class="vlist"><dl> <dt> --revision=<n>[:<n>] </dt> @@ -555,9 +603,9 @@ supported </p> </dd> -</dl> -<p>New features:</p> -<dl> +</dl></div> +<div class="para"><p>New features:</p></div> +<div class="vlist"><dl> <dt> --show-commit </dt> @@ -574,7 +622,7 @@ our version of --pretty=oneline </p> </dd> -</dl> +</dl></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -585,7 +633,7 @@ environment). This command has the same behaviour.</td> </tr></table> </div> -<p>Any other arguments are passed directly to <tt>git-log</tt></p> +<div class="para"><p>Any other arguments are passed directly to <em>git-log</em></p></div> </dd> <dt> <em>blame</em> @@ -594,27 +642,27 @@ <p> Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of - <tt>svn blame' by default. Like the SVN blame command, + `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working copy are ignored; the version of the file in the HEAD revision is annotated. Unknown - arguments are passed directly to `git-blame</tt>. + arguments are passed directly to <em>git-blame</em>. </p> -<dl> +<div class="vlist"><dl> <dt> --git-format </dt> <dd> <p> - Produce output in the same format as <tt>git-blame</tt>, but with + Produce output in the same format as <em>git-blame</em>, but with SVN revision numbers instead of git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0. </p> </dd> -</dl> +</dl></div> </dd> -</dl> -<dl> +</dl></div> +<div class="vlist"><dl> <dt> <em>find-rev</em> </dt> @@ -637,7 +685,7 @@ absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place - independently of <tt>git-svn</tt> functions. + independently of <em>git-svn</em> functions. </p> </dd> <dt> @@ -668,12 +716,12 @@ <p> Commits the diff of two tree-ish arguments from the command-line. This command is intended for interoperability with - <tt>git-svnimport</tt> and does not rely on being inside an <tt>git-svn + <em>git-svnimport</em> and does not rely on being inside an <tt>git-svn init</tt>-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument - (URL) may be omitted if you are working from a <tt>git-svn</tt>-aware - repository (that has been <tt>init</tt>-ed with <tt>git-svn</tt>). + (URL) may be omitted if you are working from a <em>git-svn</em>-aware + repository (that has been <tt>init</tt>-ed with <em>git-svn</em>). The -r<revision> option is required for this. </p> </dd> @@ -716,11 +764,11 @@ specific revision. </p> </dd> -</dl> +</dl></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --shared[={false|true|umask|group|all|world|everybody}] </dt> @@ -730,7 +778,7 @@ <dd> <p> Only used with the <em>init</em> command. - These are passed directly to <tt>git-init</tt>. + These are passed directly to <em>git-init</em>. </p> </dd> <dt> @@ -743,12 +791,12 @@ <p> Used with the <em>fetch</em> command. </p> -<p>This allows revision ranges for partial/cauterized history +<div class="para"><p>This allows revision ranges for partial/cauterized history to be supported. $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges), -$NUMBER:HEAD, and BASE:$NUMBER are all supported.</p> -<p>This can allow you to make partial mirrors when running fetch; +$NUMBER:HEAD, and BASE:$NUMBER are all supported.</p></div> +<div class="para"><p>This can allow you to make partial mirrors when running fetch; but is generally not recommended because history will be skipped -and lost.</p> +and lost.</p></div> </dd> <dt> - @@ -760,9 +808,9 @@ <p> Only used with the <em>set-tree</em> command. </p> -<p>Read a list of commits from stdin and commit them in reverse +<div class="para"><p>Read a list of commits from stdin and commit them in reverse order. Only the leading sha1 is read from each line, so -<tt>git-rev-list --pretty=oneline</tt> output can be used.</p> +<em>git-rev-list --pretty=oneline</em> output can be used.</p></div> </dd> <dt> --rmdir @@ -771,12 +819,12 @@ <p> Only used with the <em>dcommit</em>, <em>set-tree</em> and <em>commit-diff</em> commands. </p> -<p>Remove directories from the SVN tree if there are no files left +<div class="para"><p>Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. git cannot version empty directories. Enabling this flag will make -the commit to SVN act like git.</p> -<p>config key: svn.rmdir</p> +the commit to SVN act like git.</p></div> +<div class="para"><p>config key: svn.rmdir</p></div> </dd> <dt> -e @@ -788,10 +836,10 @@ <p> Only used with the <em>dcommit</em>, <em>set-tree</em> and <em>commit-diff</em> commands. </p> -<p>Edit the commit message before committing to SVN. This is off by +<div class="para"><p>Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing -tree objects.</p> -<p>config key: svn.edit</p> +tree objects.</p></div> +<div class="para"><p>config key: svn.edit</p></div> </dd> <dt> -l<num> @@ -803,8 +851,8 @@ <p> Only used with the <em>dcommit</em>, <em>set-tree</em> and <em>commit-diff</em> commands. </p> -<p>They are both passed directly to <tt>git-diff-tree</tt>; see -<a href="git-diff-tree.html">git-diff-tree(1)</a> for more information.</p> +<div class="para"><p>They are both passed directly to <em>git-diff-tree</em>; see +<a href="git-diff-tree.html">git-diff-tree(1)</a> for more information.</p></div> <div class="verseblock"> <div class="content">config key: svn.l config key: svn.findcopiesharder</div></div> @@ -817,19 +865,19 @@ </dt> <dd> <p> -Syntax is compatible with the files used by <tt>git-svnimport</tt> and -<tt>git-cvsimport</tt>: +Syntax is compatible with the files used by <em>git-svnimport</em> and +<em>git-cvsimport</em>: </p> <div class="listingblock"> <div class="content"> <pre><tt> loginname = Joe User <user@example.com></tt></pre> </div></div> -<p>If this option is specified and <tt>git-svn</tt> encounters an SVN -committer name that does not exist in the authors-file, <tt>git-svn</tt> +<div class="para"><p>If this option is specified and <em>git-svn</em> encounters an SVN +committer name that does not exist in the authors-file, <em>git-svn</em> will abort operation. The user will then have to add the -appropriate entry. Re-running the previous <tt>git-svn</tt> command -after the authors-file is modified should continue operation.</p> -<p>config key: svn.authorsfile</p> +appropriate entry. Re-running the previous <em>git-svn</em> command +after the authors-file is modified should continue operation.</p></div> +<div class="para"><p>config key: svn.authorsfile</p></div> </dd> <dt> -q @@ -839,7 +887,7 @@ </dt> <dd> <p> - Make <tt>git-svn</tt> less verbose. + Make <em>git-svn</em> less verbose. </p> </dd> <dt> @@ -853,10 +901,10 @@ These should help keep disk usage sane for large fetches with many revisions. </p> -<p>--repack takes an optional argument for the number of revisions +<div class="para"><p>--repack takes an optional argument for the number of revisions to fetch before repacking. This defaults to repacking every -1000 commits fetched if no argument is specified.</p> -<p>--repack-flags are passed directly to <tt>git-repack</tt>.</p> +1000 commits fetched if no argument is specified.</p></div> +<div class="para"><p>--repack-flags are passed directly to <em>git-repack</em>.</p></div> <div class="verseblock"> <div class="content">config key: svn.repack config key: svn.repackflags</div></div> @@ -877,8 +925,8 @@ <p> These are only used with the <em>dcommit</em> and <em>rebase</em> commands. </p> -<p>Passed directly to <tt>git-rebase</tt> when using <em>dcommit</em> if a -<tt>git-reset</tt> cannot be used (see <em>dcommit</em>).</p> +<div class="para"><p>Passed directly to <em>git-rebase</em> when using <em>dcommit</em> if a +<em>git-reset</em> cannot be used (see <em>dcommit</em>).</p></div> </dd> <dt> -n @@ -890,17 +938,17 @@ <p> This can be used with the <em>dcommit</em> and <em>rebase</em> commands. </p> -<p>For <em>dcommit</em>, print out the series of git arguments that would show -which diffs would be committed to SVN.</p> -<p>For <em>rebase</em>, display the local branch associated with the upstream svn +<div class="para"><p>For <em>dcommit</em>, print out the series of git arguments that would show +which diffs would be committed to SVN.</p></div> +<div class="para"><p>For <em>rebase</em>, display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn -repository that will be fetched from.</p> +repository that will be fetched from.</p></div> </dd> -</dl> +</dl></div> </div> -<h2>ADVANCED OPTIONS</h2> +<h2 id="_advanced_options">ADVANCED OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -i<GIT_SVN_ID> </dt> @@ -939,13 +987,13 @@ descended from. This feature is enabled by default, use --no-follow-parent to disable it. </p> -<p>config key: svn.followparent</p> +<div class="para"><p>config key: svn.followparent</p></div> </dd> -</dl> +</dl></div> </div> -<h2>CONFIG FILE-ONLY OPTIONS</h2> +<h2 id="_config_file_only_options">CONFIG FILE-ONLY OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> svn.noMetadata </dt> @@ -956,12 +1004,12 @@ <p> This gets rid of the <em>git-svn-id:</em> lines at the end of every commit. </p> -<p>If you lose your .git/svn/git-svn/.rev_db file, <tt>git-svn</tt> will not +<div class="para"><p>If you lose your .git/svn/git-svn/.rev_db file, <em>git-svn</em> will not be able to rebuild it and you won't be able to fetch again, -either. This is fine for one-shot imports.</p> -<p>The <tt>git-svn log</tt> command will not work on repositories using +either. This is fine for one-shot imports.</p></div> +<div class="para"><p>The <em>git-svn log</em> command will not work on repositories using this, either. Using this conflicts with the <em>useSvmProps</em> -option for (hopefully) obvious reasons.</p> +option for (hopefully) obvious reasons.</p></div> </dd> <dt> svn.useSvmProps @@ -971,16 +1019,16 @@ </dt> <dd> <p> -This allows <tt>git-svn</tt> to re-map repository URLs and UUIDs from +This allows <em>git-svn</em> to re-map repository URLs and UUIDs from mirrors created using SVN::Mirror (or svk) for metadata. </p> -<p>If an SVN revision has a property, "svm:headrev", it is likely +<div class="para"><p>If an SVN revision has a property, "svm:headrev", it is likely that the revision was created by SVN::Mirror (also used by SVK). The property contains a repository UUID and a revision. We want to make it look like we are mirroring the original URL, so introduce a helper function that returns the original identity URL and UUID, and use it when generating metadata in commit -messages.</p> +messages.</p></div> </dd> <dt> svn.useSvnsyncProps @@ -1001,23 +1049,23 @@ <dd> <p> This allows users to create repositories from alternate - URLs. For example, an administrator could run <tt>git-svn</tt> on the + URLs. For example, an administrator could run <em>git-svn</em> on the server locally (accessing via file://) but wish to distribute the repository with a public http:// or svn:// URL in the metadata so users of it will see the public URL. </p> </dd> -</dl> -<p>Since the noMetadata, rewriteRoot, useSvnsyncProps and useSvmProps -options all affect the metadata generated and used by <tt>git-svn</tt>; they +</dl></div> +<div class="para"><p>Since the noMetadata, rewriteRoot, useSvnsyncProps and useSvmProps +options all affect the metadata generated and used by <em>git-svn</em>; they <strong>must</strong> be set in the configuration file before any history is imported -and these settings should never be changed once they are set.</p> -<p>Additionally, only one of these four options can be used per-svn-remote -section because they affect the <em>git-svn-id:</em> metadata line.</p> +and these settings should never be changed once they are set.</p></div> +<div class="para"><p>Additionally, only one of these four options can be used per-svn-remote +section because they affect the <em>git-svn-id:</em> metadata line.</p></div> </div> -<h2>BASIC EXAMPLES</h2> +<h2 id="_basic_examples">BASIC EXAMPLES</h2> <div class="sectionbody"> -<p>Tracking and contributing to the trunk of a Subversion-managed project:</p> +<div class="para"><p>Tracking and contributing to the trunk of a Subversion-managed project:</p></div> <div class="listingblock"> <div class="content"> <pre><tt># Clone a repo (like git clone): @@ -1037,8 +1085,8 @@ # Append svn:ignore settings to the default git exclude file: git svn show-ignore >> .git/info/exclude</tt></pre> </div></div> -<p>Tracking and contributing to an entire Subversion-managed project -(complete with a trunk, tags and branches):</p> +<div class="para"><p>Tracking and contributing to an entire Subversion-managed project +(complete with a trunk, tags and branches):</p></div> <div class="listingblock"> <div class="content"> <pre><tt># Clone a repo (like git clone): @@ -1051,12 +1099,12 @@ # You may only dcommit to one branch/tag/trunk at a time. The usage # of dcommit/rebase/show-ignore should be the same as above.</tt></pre> </div></div> -<p>The initial <tt>git-svn clone</tt> can be quite time-consuming +<div class="para"><p>The initial <em>git-svn clone</em> can be quite time-consuming (especially for large Subversion repositories). If multiple people (or one person with multiple machines) want to use -<tt>git-svn</tt> to interact with the same Subversion repository, you can -do the initial <tt>git-svn clone</tt> to a repository on a server and -have each person clone that repository with <tt>git-clone</tt>:</p> +<em>git-svn</em> to interact with the same Subversion repository, you can +do the initial <em>git-svn clone</em> to a repository on a server and +have each person clone that repository with <em>git-clone</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt># Do the initial import on a server @@ -1074,76 +1122,76 @@ git svn rebase</tt></pre> </div></div> </div> -<h2>REBASE VS. PULL/MERGE</h2> +<h2 id="_rebase_vs_pull_merge">REBASE VS. PULL/MERGE</h2> <div class="sectionbody"> -<p>Originally, <tt>git-svn</tt> recommended that the <em>remotes/git-svn</em> branch be +<div class="para"><p>Originally, <em>git-svn</em> recommended that the <em>remotes/git-svn</em> branch be pulled or merged from. This is because the author favored <tt>git svn set-tree B</tt> to commit a single head rather than the -<tt>git svn set-tree A..B</tt> notation to commit multiple commits.</p> -<p>If you use <tt>git svn set-tree A..B</tt> to commit several diffs and you do +<tt>git svn set-tree A..B</tt> notation to commit multiple commits.</p></div> +<div class="para"><p>If you use <tt>git svn set-tree A..B</tt> to commit several diffs and you do not have the latest remotes/git-svn merged into my-branch, you should use <tt>git svn rebase</tt> to update your work branch instead of <tt>git pull</tt> or <tt>git merge</tt>. <tt>pull</tt>/`merge' can cause non-linear history to be flattened when committing into SVN, which can lead to merge commits reversing -previous commits in SVN.</p> +previous commits in SVN.</p></div> </div> -<h2>DESIGN PHILOSOPHY</h2> +<h2 id="_design_philosophy">DESIGN PHILOSOPHY</h2> <div class="sectionbody"> -<p>Merge tracking in Subversion is lacking and doing branched development -with Subversion can be cumbersome as a result. While <tt>git-svn</tt> can track +<div class="para"><p>Merge tracking in Subversion is lacking and doing branched development +with Subversion can be cumbersome as a result. While <em>git-svn</em> can track copy history (including branches and tags) for repositories adopting a standard layout, it cannot yet represent merge history that happened inside git back upstream to SVN users. Therefore it is advised that users keep history as linear as possible inside git to ease -compatibility with SVN (see the CAVEATS section below).</p> +compatibility with SVN (see the CAVEATS section below).</p></div> </div> -<h2>CAVEATS</h2> +<h2 id="_caveats">CAVEATS</h2> <div class="sectionbody"> -<p>For the sake of simplicity and interoperating with a less-capable system -(SVN), it is recommended that all <tt>git-svn</tt> users clone, fetch and dcommit -directly from the SVN server, and avoid all <tt>git-clone</tt>/<tt>pull</tt>/<tt>merge</tt>/<tt>push</tt> +<div class="para"><p>For the sake of simplicity and interoperating with a less-capable system +(SVN), it is recommended that all <em>git-svn</em> users clone, fetch and dcommit +directly from the SVN server, and avoid all <em>git-clone</em>/<em>pull</em>/<em>merge</em>/<em>push</em> operations between git repositories and branches. The recommended method of exchanging code between git branches and users is -<tt>git-format-patch</tt> and <tt>git-am</tt>, or just 'dcommit'ing to the SVN repository.</p> -<p>Running <tt>git-merge</tt> or <tt>git-pull</tt> is NOT recommended on a branch you +<em>git-format-patch</em> and <em>git-am</em>, or just 'dcommit'ing to the SVN repository.</p></div> +<div class="para"><p>Running <em>git-merge</em> or <em>git-pull</em> is NOT recommended on a branch you plan to <em>dcommit</em> from. Subversion does not represent merges in any reasonable or useful fashion; so users using Subversion cannot see any merges you've made. Furthermore, if you merge or pull from a git branch that is a mirror of an SVN branch, <em>dcommit</em> may commit to the wrong -branch.</p> -<p><tt>git-clone</tt> does not clone branches under the refs/remotes/ hierarchy or -any <tt>git-svn</tt> metadata, or config. So repositories created and managed with -using <tt>git-svn</tt> should use <tt>rsync</tt> for cloning, if cloning is to be done -at all.</p> -<p>Since <em>dcommit</em> uses rebase internally, any git branches you <tt>git-push</tt> to +branch.</p></div> +<div class="para"><p><em>git-clone</em> does not clone branches under the refs/remotes/ hierarchy or +any <em>git-svn</em> metadata, or config. So repositories created and managed with +using <em>git-svn</em> should use <em>rsync</em> for cloning, if cloning is to be done +at all.</p></div> +<div class="para"><p>Since <em>dcommit</em> uses rebase internally, any git branches you <em>git-push</em> to before <em>dcommit</em> on will require forcing an overwrite of the existing ref on the remote repository. This is generally considered bad practice, -see the <a href="git-push.html">git-push(1)</a> documentation for details.</p> -<p>Do not use the --amend option of <a href="git-commit.html">git-commit(1)</a> on a change you've +see the <a href="git-push.html">git-push(1)</a> documentation for details.</p></div> +<div class="para"><p>Do not use the --amend option of <a href="git-commit.html">git-commit(1)</a> on a change you've already dcommitted. It is considered bad practice to --amend commits you've already pushed to a remote repository for other users, and -dcommit with SVN is analogous to that.</p> +dcommit with SVN is analogous to that.</p></div> </div> -<h2>BUGS</h2> +<h2 id="_bugs">BUGS</h2> <div class="sectionbody"> -<p>We ignore all SVN properties except svn:executable. Any unhandled -properties are logged to $GIT_DIR/svn/<refname>/unhandled.log</p> -<p>Renamed and copied directories are not detected by git and hence not +<div class="para"><p>We ignore all SVN properties except svn:executable. Any unhandled +properties are logged to $GIT_DIR/svn/<refname>/unhandled.log</p></div> +<div class="para"><p>Renamed and copied directories are not detected by git and hence not tracked when committing to SVN. I do not plan on adding support for this as it's quite difficult and time-consuming to get working for all the possible corner cases (git doesn't do it, either). Committing renamed and copied files are fully supported if they're similar enough -for git to detect them.</p> +for git to detect them.</p></div> </div> -<h2>CONFIGURATION</h2> +<h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<p><tt>git-svn</tt> stores [svn-remote] configuration information in the +<div class="para"><p><em>git-svn</em> stores [svn-remote] configuration information in the repository .git/config file. It is similar the core git [remote] sections except <em>fetch</em> keys do not accept glob arguments; but they are instead handled by the <em>branches</em> and <em>tags</em> keys. Since some SVN repositories are oddly configured with multiple projects glob expansions such those -listed below are allowed:</p> +listed below are allowed:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[svn-remote "project-a"] @@ -1152,28 +1200,28 @@ tags = tags/*/project-a:refs/remotes/project-a/tags/* trunk = trunk/project-a:refs/remotes/project-a/trunk</tt></pre> </div></div> -<p>Keep in mind that the <em><strong></em> (asterisk) wildcard of the local ref +<div class="para"><p>Keep in mind that the <em><strong></em> (asterisk) wildcard of the local ref (right of the <em>:</em>) *must</strong> be the farthest right path component; however the remote wildcard may be anywhere as long as it's own independent path component (surrounded by <em>/</em> or EOL). This type of configuration is not automatically created by <em>init</em> and -should be manually entered with a text-editor or using <tt>git-config</tt>.</p> +should be manually entered with a text-editor or using <em>git-config</em>.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-rebase.html">git-rebase(1)</a></p> +<div class="para"><p><a href="git-rebase.html">git-rebase(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Eric Wong <normalperson@yhbt.net>.</p> +<div class="para"><p>Written by Eric Wong <normalperson@yhbt.net>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Written by Eric Wong <normalperson@yhbt.net>.</p> +<div class="para"><p>Written by Eric Wong <normalperson@yhbt.net>.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:04 UTC +Last updated 2008-07-06 05:17:04 UTC </div> </div> </body> diff --git a/git-svn.txt b/git-svn.txt index 6caa130..e7c0f1c 100644 --- a/git-svn.txt +++ b/git-svn.txt
@@ -11,17 +11,17 @@ DESCRIPTION ----------- -`git-svn` is a simple conduit for changesets between Subversion and git. +'git-svn' is a simple conduit for changesets between Subversion and git. It is not to be confused with linkgit:git-svnimport[1], which is read-only. -`git-svn` was originally designed for an individual developer who wants a +'git-svn' was originally designed for an individual developer who wants a bidirectional flow of changesets between a single branch in Subversion and an arbitrary number of branches in git. Since its inception, -`git-svn` has gained the ability to track multiple branches in a manner -similar to `git-svnimport`. +'git-svn' has gained the ability to track multiple branches in a manner +similar to 'git-svnimport'. -`git-svn` is especially useful when it comes to tracking repositories +'git-svn' is especially useful when it comes to tracking repositories not organized in the way Subversion developers recommend (trunk, branches, tags directories). @@ -31,7 +31,7 @@ 'init':: Initializes an empty git repository with additional - metadata directories for `git-svn`. The Subversion URL + metadata directories for 'git-svn'. The Subversion URL may be specified as a command-line argument, or as full URL arguments to -T/-t/-b. Optionally, the target directory to operate on can be specified as a second @@ -107,20 +107,20 @@ This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it. -This works similarly to `svn update` or `git-pull` except that -it preserves linear history with `git-rebase` instead of -`git-merge` for ease of dcommiting with `git-svn`. +This works similarly to `svn update` or 'git-pull' except that +it preserves linear history with 'git-rebase' instead of +'git-merge' for ease of dcommiting with 'git-svn'. -This accepts all options that `git-svn fetch` and `git-rebase` +This accepts all options that 'git-svn fetch' and 'git-rebase' accept. However, '--fetch-all' only fetches from the current [svn-remote], and not all [svn-remote] definitions. -Like `git-rebase`; this requires that the working tree be clean +Like 'git-rebase'; this requires that the working tree be clean and have no uncommitted changes. -l;; --local;; - Do not fetch remotely; only run `git-rebase` against the + Do not fetch remotely; only run 'git-rebase' against the last fetched commit from the upstream SVN. 'dcommit':: @@ -128,7 +128,7 @@ repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in git. - It is recommended that you run `git-svn` fetch and rebase (not + It is recommended that you run 'git-svn' fetch and rebase (not pull or merge) your commits against the latest changes in the SVN repository. An optional command-line argument may be specified as an @@ -173,7 +173,7 @@ client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour. + -Any other arguments are passed directly to `git-log` +Any other arguments are passed directly to 'git-log' 'blame':: Show what revision and author last modified each line of a file. The @@ -181,10 +181,10 @@ `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working copy are ignored; the version of the file in the HEAD revision is annotated. Unknown - arguments are passed directly to `git-blame`. + arguments are passed directly to 'git-blame'. + --git-format;; - Produce output in the same format as `git-blame`, but with + Produce output in the same format as 'git-blame', but with SVN revision numbers instead of git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0. @@ -203,7 +203,7 @@ absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place - independently of `git-svn` functions. + independently of 'git-svn' functions. 'create-ignore':: Recursively finds the svn:ignore property on directories and @@ -219,12 +219,12 @@ 'commit-diff':: Commits the diff of two tree-ish arguments from the command-line. This command is intended for interoperability with - `git-svnimport` and does not rely on being inside an `git-svn + 'git-svnimport' and does not rely on being inside an `git-svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument - (URL) may be omitted if you are working from a `git-svn`-aware - repository (that has been `init`-ed with `git-svn`). + (URL) may be omitted if you are working from a 'git-svn'-aware + repository (that has been `init`-ed with 'git-svn'). The -r<revision> option is required for this. 'info':: @@ -255,7 +255,7 @@ --shared[={false|true|umask|group|all|world|everybody}]:: --template=<template_directory>:: Only used with the 'init' command. - These are passed directly to `git-init`. + These are passed directly to 'git-init'. -r <ARG>:: --revision <ARG>:: @@ -277,7 +277,7 @@ Read a list of commits from stdin and commit them in reverse order. Only the leading sha1 is read from each line, so -`git-rev-list --pretty=oneline` output can be used. +'git-rev-list --pretty=oneline' output can be used. --rmdir:: @@ -307,7 +307,7 @@ Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands. -They are both passed directly to `git-diff-tree`; see +They are both passed directly to 'git-diff-tree'; see linkgit:git-diff-tree[1] for more information. [verse] @@ -317,24 +317,24 @@ -A<filename>:: --authors-file=<filename>:: -Syntax is compatible with the files used by `git-svnimport` and -`git-cvsimport`: +Syntax is compatible with the files used by 'git-svnimport' and +'git-cvsimport': ------------------------------------------------------------------------ loginname = Joe User <user@example.com> ------------------------------------------------------------------------ -If this option is specified and `git-svn` encounters an SVN -committer name that does not exist in the authors-file, `git-svn` +If this option is specified and 'git-svn' encounters an SVN +committer name that does not exist in the authors-file, 'git-svn' will abort operation. The user will then have to add the -appropriate entry. Re-running the previous `git-svn` command +appropriate entry. Re-running the previous 'git-svn' command after the authors-file is modified should continue operation. config key: svn.authorsfile -q:: --quiet:: - Make `git-svn` less verbose. + Make 'git-svn' less verbose. --repack[=<n>]:: --repack-flags=<flags>:: @@ -346,7 +346,7 @@ to fetch before repacking. This defaults to repacking every 1000 commits fetched if no argument is specified. ---repack-flags are passed directly to `git-repack`. +--repack-flags are passed directly to 'git-repack'. [verse] config key: svn.repack @@ -359,8 +359,8 @@ These are only used with the 'dcommit' and 'rebase' commands. -Passed directly to `git-rebase` when using 'dcommit' if a -`git-reset` cannot be used (see 'dcommit'). +Passed directly to 'git-rebase' when using 'dcommit' if a +'git-reset' cannot be used (see 'dcommit'). -n:: --dry-run:: @@ -413,18 +413,18 @@ This gets rid of the 'git-svn-id:' lines at the end of every commit. -If you lose your .git/svn/git-svn/.rev_db file, `git-svn` will not +If you lose your .git/svn/git-svn/.rev_db file, 'git-svn' will not be able to rebuild it and you won't be able to fetch again, either. This is fine for one-shot imports. -The `git-svn log` command will not work on repositories using +The 'git-svn log' command will not work on repositories using this, either. Using this conflicts with the 'useSvmProps' option for (hopefully) obvious reasons. svn.useSvmProps:: svn-remote.<name>.useSvmProps:: -This allows `git-svn` to re-map repository URLs and UUIDs from +This allows 'git-svn' to re-map repository URLs and UUIDs from mirrors created using SVN::Mirror (or svk) for metadata. If an SVN revision has a property, "svm:headrev", it is likely @@ -443,7 +443,7 @@ svn-remote.<name>.rewriteRoot:: This allows users to create repositories from alternate - URLs. For example, an administrator could run `git-svn` on the + URLs. For example, an administrator could run 'git-svn' on the server locally (accessing via file://) but wish to distribute the repository with a public http:// or svn:// URL in the metadata so users of it will see the public URL. @@ -451,7 +451,7 @@ -- Since the noMetadata, rewriteRoot, useSvnsyncProps and useSvmProps -options all affect the metadata generated and used by `git-svn`; they +options all affect the metadata generated and used by 'git-svn'; they *must* be set in the configuration file before any history is imported and these settings should never be changed once they are set. @@ -498,12 +498,12 @@ # of dcommit/rebase/show-ignore should be the same as above. ------------------------------------------------------------------------ -The initial `git-svn clone` can be quite time-consuming +The initial 'git-svn clone' can be quite time-consuming (especially for large Subversion repositories). If multiple people (or one person with multiple machines) want to use -`git-svn` to interact with the same Subversion repository, you can -do the initial `git-svn clone` to a repository on a server and -have each person clone that repository with `git-clone`: +'git-svn' to interact with the same Subversion repository, you can +do the initial 'git-svn clone' to a repository on a server and +have each person clone that repository with 'git-clone': ------------------------------------------------------------------------ # Do the initial import on a server @@ -524,7 +524,7 @@ REBASE VS. PULL/MERGE --------------------- -Originally, `git-svn` recommended that the 'remotes/git-svn' branch be +Originally, 'git-svn' recommended that the 'remotes/git-svn' branch be pulled or merged from. This is because the author favored `git svn set-tree B` to commit a single head rather than the `git svn set-tree A..B` notation to commit multiple commits. @@ -539,7 +539,7 @@ DESIGN PHILOSOPHY ----------------- Merge tracking in Subversion is lacking and doing branched development -with Subversion can be cumbersome as a result. While `git-svn` can track +with Subversion can be cumbersome as a result. While 'git-svn' can track copy history (including branches and tags) for repositories adopting a standard layout, it cannot yet represent merge history that happened inside git back upstream to SVN users. Therefore it is advised that @@ -550,25 +550,25 @@ ------- For the sake of simplicity and interoperating with a less-capable system -(SVN), it is recommended that all `git-svn` users clone, fetch and dcommit -directly from the SVN server, and avoid all `git-clone`/`pull`/`merge`/`push` +(SVN), it is recommended that all 'git-svn' users clone, fetch and dcommit +directly from the SVN server, and avoid all 'git-clone'/'pull'/'merge'/'push' operations between git repositories and branches. The recommended method of exchanging code between git branches and users is -`git-format-patch` and `git-am`, or just 'dcommit'ing to the SVN repository. +'git-format-patch' and 'git-am', or just 'dcommit'ing to the SVN repository. -Running `git-merge` or `git-pull` is NOT recommended on a branch you +Running 'git-merge' or 'git-pull' is NOT recommended on a branch you plan to 'dcommit' from. Subversion does not represent merges in any reasonable or useful fashion; so users using Subversion cannot see any merges you've made. Furthermore, if you merge or pull from a git branch that is a mirror of an SVN branch, 'dcommit' may commit to the wrong branch. -`git-clone` does not clone branches under the refs/remotes/ hierarchy or -any `git-svn` metadata, or config. So repositories created and managed with -using `git-svn` should use `rsync` for cloning, if cloning is to be done +'git-clone' does not clone branches under the refs/remotes/ hierarchy or +any 'git-svn' metadata, or config. So repositories created and managed with +using 'git-svn' should use 'rsync' for cloning, if cloning is to be done at all. -Since 'dcommit' uses rebase internally, any git branches you `git-push` to +Since 'dcommit' uses rebase internally, any git branches you 'git-push' to before 'dcommit' on will require forcing an overwrite of the existing ref on the remote repository. This is generally considered bad practice, see the linkgit:git-push[1] documentation for details. @@ -594,7 +594,7 @@ CONFIGURATION ------------- -`git-svn` stores [svn-remote] configuration information in the +'git-svn' stores [svn-remote] configuration information in the repository .git/config file. It is similar the core git [remote] sections except 'fetch' keys do not accept glob arguments; but they are instead handled by the 'branches' @@ -615,7 +615,7 @@ however the remote wildcard may be anywhere as long as it's own independent path component (surrounded by '/' or EOL). This type of configuration is not automatically created by 'init' and -should be manually entered with a text-editor or using `git-config`. +should be manually entered with a text-editor or using 'git-config'. SEE ALSO -------- diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index 548a515..d6a7408 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-symbolic-ref(1)</title> </head> @@ -272,23 +320,23 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git symbolic-ref</em> [-q] [-m <reason>] <name> [<ref>]</p> +<div class="para"><p><em>git symbolic-ref</em> [-q] [-m <reason>] <name> [<ref>]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Given one argument, reads which branch head the given symbolic +<div class="para"><p>Given one argument, reads which branch head the given symbolic ref refers to and outputs its path, relative to the <tt>.git/</tt> directory. Typically you would give <tt>HEAD</tt> as the <name> -argument to see on which branch your working tree is on.</p> -<p>Give two arguments, create or update a symbolic ref <name> to -point at the given branch <ref>.</p> -<p>A symbolic ref is a regular file that stores a string that +argument to see on which branch your working tree is on.</p></div> +<div class="para"><p>Give two arguments, create or update a symbolic ref <name> to +point at the given branch <ref>.</p></div> +<div class="para"><p>A symbolic ref is a regular file that stores a string that begins with <tt>ref: refs/</tt>. For example, your <tt>.git/HEAD</tt> is -a regular file whose contents is <tt>ref: refs/heads/master</tt>.</p> +a regular file whose contents is <tt>ref: refs/heads/master</tt>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -q </dt> @@ -311,11 +359,11 @@ when creating or updating a symbolic ref. </p> </dd> -</dl> +</dl></div> </div> -<h2>NOTES</h2> +<h2 id="_notes">NOTES</h2> <div class="sectionbody"> -<p>In the past, <tt>.git/HEAD</tt> was a symbolic link pointing at +<div class="para"><p>In the past, <tt>.git/HEAD</tt> was a symbolic link pointing at <tt>refs/heads/master</tt>. When we wanted to switch to another branch, we did <tt>ln -sf refs/heads/newbranch .git/HEAD</tt>, and when we wanted to find out which branch we are on, we did <tt>readlink .git/HEAD</tt>. @@ -324,22 +372,22 @@ or that do not have the <tt>readlink(1)</tt> command, this was a bit cumbersome. On some platforms, <tt>ln -sf</tt> does not even work as advertised (horrors). Therefore symbolic links are now deprecated -and symbolic refs are used by default.</p> -<p><tt>git-symbolic-ref</tt> will exit with status 0 if the contents of the +and symbolic refs are used by default.</p></div> +<div class="para"><p><em>git-symbolic-ref</em> will exit with status 0 if the contents of the symbolic ref were printed correctly, with status 1 if the requested -name is not a symbolic ref, or 128 if another error occurs.</p> +name is not a symbolic ref, or 128 if another error occurs.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:04 UTC +Last updated 2008-07-06 05:17:05 UTC </div> </div> </body> diff --git a/git-symbolic-ref.txt b/git-symbolic-ref.txt index a496241..6266e6f 100644 --- a/git-symbolic-ref.txt +++ b/git-symbolic-ref.txt
@@ -49,7 +49,7 @@ advertised (horrors). Therefore symbolic links are now deprecated and symbolic refs are used by default. -`git-symbolic-ref` will exit with status 0 if the contents of the +'git-symbolic-ref' will exit with status 0 if the contents of the symbolic ref were printed correctly, with status 1 if the requested name is not a symbolic ref, or 128 if another error occurs.
diff --git a/git-tag.html b/git-tag.html index ad0f3dc..da82129 100644 --- a/git-tag.html +++ b/git-tag.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-tag(1)</title> </head> @@ -278,27 +326,27 @@ <em>git tag</em> [-n[<num>]] -l [<pattern>] <em>git tag</em> -v <name>…</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Adds a <em>tag</em> reference in <tt>.git/refs/tags/</tt></p> -<p>Unless <tt>-f</tt> is given, the tag must not yet exist in -<tt>.git/refs/tags/</tt> directory.</p> -<p>If one of <tt>-a</tt>, <tt>-s</tt>, or <tt>-u <key-id></tt> is passed, the command +<div class="para"><p>Adds a <em>tag</em> reference in <tt>.git/refs/tags/</tt></p></div> +<div class="para"><p>Unless <tt>-f</tt> is given, the tag must not yet exist in +<tt>.git/refs/tags/</tt> directory.</p></div> +<div class="para"><p>If one of <tt>-a</tt>, <tt>-s</tt>, or <tt>-u <key-id></tt> is passed, the command creates a <em>tag</em> object, and requires the tag message. Unless <tt>-m <msg></tt> or <tt>-F <file></tt> is given, an editor is started for the user to type -in the tag message.</p> -<p>If <tt>-m <msg></tt> or <tt>-F <file></tt> is given and <tt>-a</tt>, <tt>-s</tt>, and <tt>-u <key-id></tt> -are absent, <tt>-a</tt> is implied.</p> -<p>Otherwise just the SHA1 object name of the commit object is -written (i.e. a lightweight tag).</p> -<p>A GnuPG signed tag object will be created when <tt>-s</tt> or <tt>-u +in the tag message.</p></div> +<div class="para"><p>If <tt>-m <msg></tt> or <tt>-F <file></tt> is given and <tt>-a</tt>, <tt>-s</tt>, and <tt>-u <key-id></tt> +are absent, <tt>-a</tt> is implied.</p></div> +<div class="para"><p>Otherwise just the SHA1 object name of the commit object is +written (i.e. a lightweight tag).</p></div> +<div class="para"><p>A GnuPG signed tag object will be created when <tt>-s</tt> or <tt>-u <key-id></tt> is used. When <tt>-u <key-id></tt> is not used, the committer identity for the current user is used to find the -GnuPG key for signing.</p> +GnuPG key for signing.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -a </dt> @@ -390,31 +438,31 @@ is given. </p> </dd> -</dl> +</dl></div> </div> -<h2>CONFIGURATION</h2> +<h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<p>By default, <tt>git-tag</tt> in sign-with-default mode (-s) will use your +<div class="para"><p>By default, <em>git-tag</em> in sign-with-default mode (-s) will use your committer identity (of the form "Your Name <your@email.address>") to find a key. If you want to use a different default key, you can specify -it in the repository configuration as follows:</p> +it in the repository configuration as follows:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[user] signingkey = <gpg-key-id></tt></pre> </div></div> </div> -<h2>DISCUSSION</h2> +<h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> -<h3>On Re-tagging</h3> -<p>What should you do when you tag a wrong commit and you would -want to re-tag?</p> -<p>If you never pushed anything out, just re-tag it. Use "-f" to -replace the old one. And you're done.</p> -<p>But if you have pushed things out (or others could just read +<h3 id="_on_re_tagging">On Re-tagging</h3><div style="clear:left"></div> +<div class="para"><p>What should you do when you tag a wrong commit and you would +want to re-tag?</p></div> +<div class="para"><p>If you never pushed anything out, just re-tag it. Use "-f" to +replace the old one. And you're done.</p></div> +<div class="para"><p>But if you have pushed things out (or others could just read your repository directly), then others will have already seen -the old tag. In that case you can do one of two things:</p> -<ol> +the old tag. In that case you can do one of two things:</p></div> +<div class="olist"><ol> <li> <p> The sane thing. @@ -429,21 +477,21 @@ <p> The insane thing. You really want to call the new version "X" too, <em>even though</em> -others have already seen the old one. So just use <tt>git-tag -f</tt> +others have already seen the old one. So just use <em>git-tag -f</em> again, as if you hadn't already published the old one. </p> </li> -</ol> -<p>However, Git does <strong>not</strong> (and it should not) change tags behind +</ol></div> +<div class="para"><p>However, Git does <strong>not</strong> (and it should not) change tags behind users back. So if somebody already got the old tag, doing a -<tt>git-pull</tt> on your tree shouldn't just make them overwrite the old -one.</p> -<p>If somebody got a release tag from you, you cannot just change +<em>git-pull</em> on your tree shouldn't just make them overwrite the old +one.</p></div> +<div class="para"><p>If somebody got a release tag from you, you cannot just change the tag for them by updating your own one. This is a big security issue, in that people MUST be able to trust their tag-names. If you really want to do the insane thing, you need to just fess up to it, and tell people that you messed up. You -can do that by making a very public announcement saying:</p> +can do that by making a very public announcement saying:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>Ok, I messed up, and I pushed out an earlier version tagged as X. I @@ -465,24 +513,24 @@ Sorry for inconvenience.</tt></pre> </div></div> -<p>Does this seem a bit complicated? It <strong>should</strong> be. There is no +<div class="para"><p>Does this seem a bit complicated? It <strong>should</strong> be. There is no way that it would be correct to just "fix" it behind peoples backs. People need to know that their tags might have been -changed.</p> -<h3>On Automatic following</h3> -<p>If you are following somebody else's tree, you are most likely +changed.</p></div> +<h3 id="_on_automatic_following">On Automatic following</h3><div style="clear:left"></div> +<div class="para"><p>If you are following somebody else's tree, you are most likely using tracking branches (<tt>refs/heads/origin</tt> in traditional layout, or <tt>refs/remotes/origin/master</tt> in the separate-remote -layout). You usually want the tags from the other end.</p> -<p>On the other hand, if you are fetching because you would want a +layout). You usually want the tags from the other end.</p></div> +<div class="para"><p>On the other hand, if you are fetching because you would want a one-shot merge from somebody else, you typically do not want to get tags from there. This happens more often for people near the toplevel but not limited to them. Mere mortals when pulling from each other do not necessarily want to automatically get -private anchor point tags from the other person.</p> -<p>You would notice "please pull" messages on the mailing list says +private anchor point tags from the other person.</p></div> +<div class="para"><p>You would notice "please pull" messages on the mailing list says repo URL and branch name alone. This is designed to be easily -cut&pasted to a <tt>git-fetch</tt> command line:</p> +cut&pasted to a <em>git-fetch</em> command line:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>Linus, please pull from @@ -491,21 +539,21 @@ to get the following updates...</tt></pre> </div></div> -<p>becomes:</p> +<div class="para"><p>becomes:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git pull git://git..../proj.git master</tt></pre> </div></div> -<p>In such a case, you do not want to automatically follow other's -tags.</p> -<p>One important aspect of git is it is distributed, and being +<div class="para"><p>In such a case, you do not want to automatically follow other's +tags.</p></div> +<div class="para"><p>One important aspect of git is it is distributed, and being distributed largely means there is no inherent "upstream" or "downstream" in the system. On the face of it, the above example might seem to indicate that the tag namespace is owned by upper echelon of people and tags only flow downwards, but that is not the case. It only shows that the usage pattern -determines who are interested in whose tags.</p> -<p>A one-shot pull is a sign that a commit history is now crossing +determines who are interested in whose tags.</p></div> +<div class="para"><p>A one-shot pull is a sign that a commit history is now crossing the boundary between one circle of people (e.g. "people who are primarily interested in networking part of the kernel") who may have their own set of tags (e.g. "this is the third release @@ -515,44 +563,44 @@ The latter are usually not interested in the detailed tags used internally in the former group (that is what "internal" means). That is why it is desirable not to follow tags automatically in -this case.</p> -<p>It may well be that among networking people, they may want to +this case.</p></div> +<div class="para"><p>It may well be that among networking people, they may want to exchange the tags internal to their group, but in that workflow they are most likely tracking with each other's progress by having tracking branches. Again, the heuristic to automatically -follow such tags is a good thing.</p> -<h3>On Backdating Tags</h3> -<p>If you have imported some changes from another VCS and would like +follow such tags is a good thing.</p></div> +<h3 id="_on_backdating_tags">On Backdating Tags</h3><div style="clear:left"></div> +<div class="para"><p>If you have imported some changes from another VCS and would like to add tags for major releases of your work, it is useful to be able to specify the date to embed inside of the tag object. The data in the tag object affects, for example, the ordering of tags in the -gitweb interface.</p> -<p>To set the date used in future tag objects, set the environment +gitweb interface.</p></div> +<div class="para"><p>To set the date used in future tag objects, set the environment variable GIT_COMMITTER_DATE to one or more of the date and time. The date and time can be specified in a number of ways; the most common -is "YYYY-MM-DD HH:MM".</p> -<p>An example follows.</p> +is "YYYY-MM-DD HH:MM".</p></div> +<div class="para"><p>An example follows.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1</tt></pre> </div></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org>, -Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.</p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>, +Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:05 UTC +Last updated 2008-07-06 05:17:05 UTC </div> </div> </body> diff --git a/git-tag.txt b/git-tag.txt index 1db98e2..b605e6c 100644 --- a/git-tag.txt +++ b/git-tag.txt
@@ -82,7 +82,7 @@ CONFIGURATION ------------- -By default, `git-tag` in sign-with-default mode (-s) will use your +By default, 'git-tag' in sign-with-default mode (-s) will use your committer identity (of the form "Your Name <your@email.address>") to find a key. If you want to use a different default key, you can specify it in the repository configuration as follows: @@ -118,12 +118,12 @@ . The insane thing. You really want to call the new version "X" too, 'even though' -others have already seen the old one. So just use `git-tag -f` +others have already seen the old one. So just use 'git-tag -f' again, as if you hadn't already published the old one. However, Git does *not* (and it should not) change tags behind users back. So if somebody already got the old tag, doing a -`git-pull` on your tree shouldn't just make them overwrite the old +'git-pull' on your tree shouldn't just make them overwrite the old one. If somebody got a release tag from you, you cannot just change @@ -177,7 +177,7 @@ You would notice "please pull" messages on the mailing list says repo URL and branch name alone. This is designed to be easily -cut&pasted to a `git-fetch` command line: +cut&pasted to a 'git-fetch' command line: ------------ Linus, please pull from
diff --git a/git-tar-tree.html b/git-tar-tree.html index a65ac83..4841847 100644 --- a/git-tar-tree.html +++ b/git-tar-tree.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-tar-tree(1)</title> </head> @@ -272,25 +320,25 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git tar-tree</em> [--remote=<repo>] <tree-ish> [ <base> ]</p> +<div class="para"><p><em>git tar-tree</em> [--remote=<repo>] <tree-ish> [ <base> ]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>THIS COMMAND IS DEPRECATED. Use <tt>git-archive</tt> with <tt>--format=tar</tt> -option instead (and move the <base> argument to <tt>--prefix=base/</tt>).</p> -<p>Creates a tar archive containing the tree structure for the named tree. +<div class="para"><p>THIS COMMAND IS DEPRECATED. Use <em>git-archive</em> with <tt>--format=tar</tt> +option instead (and move the <base> argument to <tt>--prefix=base/</tt>).</p></div> +<div class="para"><p>Creates a tar archive containing the tree structure for the named tree. When <base> is specified it is added as a leading path to the files in the -generated tar archive.</p> -<p><tt>git-tar-tree</tt> behaves differently when given a tree ID versus when given +generated tar archive.</p></div> +<div class="para"><p><em>git-tar-tree</em> behaves differently when given a tree ID versus when given a commit ID or tag ID. In the first case the current time is used as modification time of each file in the archive. In the latter case the commit time as recorded in the referenced commit object is used instead. Additionally the commit ID is stored in a global extended pax header. -It can be extracted using <tt>git-get-tar-commit-id</tt>.</p> +It can be extracted using <em>git-get-tar-commit-id</em>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <tree-ish> </dt> @@ -317,11 +365,11 @@ retrieve a tar archive from a remote repository. </p> </dd> -</dl> +</dl></div> </div> -<h2>CONFIGURATION</h2> +<h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> tar.umask </dt> @@ -334,11 +382,11 @@ details. </p> </dd> -</dl> +</dl></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> git tar-tree HEAD junk | (cd /var/tmp/ && tar xf -) </dt> @@ -383,23 +431,23 @@ into <em>git-1.4.0-docs.tar</em>, with the prefix <em>git-docs/</em>. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Rene Scharfe.</p> +<div class="para"><p>Written by Rene Scharfe.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:05 UTC +Last updated 2008-07-06 05:17:06 UTC </div> </div> </body> diff --git a/git-tar-tree.txt b/git-tar-tree.txt index b3097aa..a5d9558 100644 --- a/git-tar-tree.txt +++ b/git-tar-tree.txt
@@ -12,19 +12,19 @@ DESCRIPTION ----------- -THIS COMMAND IS DEPRECATED. Use `git-archive` with `--format=tar` +THIS COMMAND IS DEPRECATED. Use 'git-archive' with `--format=tar` option instead (and move the <base> argument to `--prefix=base/`). Creates a tar archive containing the tree structure for the named tree. When <base> is specified it is added as a leading path to the files in the generated tar archive. -`git-tar-tree` behaves differently when given a tree ID versus when given +'git-tar-tree' behaves differently when given a tree ID versus when given a commit ID or tag ID. In the first case the current time is used as modification time of each file in the archive. In the latter case the commit time as recorded in the referenced commit object is used instead. Additionally the commit ID is stored in a global extended pax header. -It can be extracted using `git-get-tar-commit-id`. +It can be extracted using 'git-get-tar-commit-id'. OPTIONS -------
diff --git a/git-update-index.html b/git-update-index.html index cc6b778..be82155 100644 --- a/git-update-index.html +++ b/git-update-index.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-update-index(1)</title> </head> @@ -286,19 +334,19 @@ [--verbose] [--] [<file>]*</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Modifies the index or directory cache. Each file mentioned is updated +<div class="para"><p>Modifies the index or directory cache. Each file mentioned is updated into the index and any <em>unmerged</em> or <em>needs updating</em> state is -cleared.</p> -<p>See also <a href="git-add.html">git-add(1)</a> for a more user-friendly way to do some of -the most common operations on the index.</p> -<p>The way <tt>git-update-index</tt> handles files it is told about can be modified -using the various options:</p> +cleared.</p></div> +<div class="para"><p>See also <a href="git-add.html">git-add(1)</a> for a more user-friendly way to do some of +the most common operations on the index.</p></div> +<div class="para"><p>The way <em>git-update-index</em> handles files it is told about can be modified +using the various options:</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --add </dt> @@ -335,21 +383,21 @@ <p> Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes - <tt>git-update-index</tt> continue anyway. + <em>git-update-index</em> continue anyway. </p> </dd> -</dl> -<p>--ignore-submodules: +</dl></div> +<div class="para"><p>--ignore-submodules: Do not try to update submodules. This option is only respected - when passed before --refresh.</p> -<dl> + when passed before --refresh.</p></div> +<div class="vlist"><dl> <dt> --unmerged </dt> <dd> <p> If --refresh finds unmerged changes in the index, the default - behavior is to error out. This option makes <tt>git-update-index</tt> + behavior is to error out. This option makes <em>git-update-index</em> continue anyway. </p> </dd> @@ -413,7 +461,7 @@ </dt> <dd> <p> - Runs <tt>git-update-index</tt> itself on the paths whose index + Runs <em>git-update-index</em> itself on the paths whose index entries are different from those from the <tt>HEAD</tt> commit. </p> </dd> @@ -451,7 +499,7 @@ <dd> <p> By default, when a file <tt>path</tt> exists in the index, - <tt>git-update-index</tt> refuses an attempt to add <tt>path/file</tt>. + <em>git-update-index</em> refuses an attempt to add <tt>path/file</tt>. Similarly if a file <tt>path/file</tt> exists, a file <tt>path</tt> cannot be added. With --replace flag, existing entries that conflicts with the entry being added are @@ -505,76 +553,76 @@ The same applies to directories ending <em>/</em> and paths with <em>//</em> </p> </dd> -</dl> +</dl></div> </div> -<h2>Using --refresh</h2> +<h2 id="_using_refresh">Using --refresh</h2> <div class="sectionbody"> -<p><em>--refresh</em> does not calculate a new sha1 file or bring the index +<div class="para"><p><em>--refresh</em> does not calculate a new sha1 file or bring the index up-to-date for mode/content changes. But what it <strong>does</strong> do is to "re-match" the stat information of a file with the index, so that you can refresh the index for a file that hasn't been changed but where -the stat entry is out of date.</p> -<p>For example, you'd want to do this after doing a <tt>git-read-tree</tt>, to link -up the stat index details with the proper files.</p> +the stat entry is out of date.</p></div> +<div class="para"><p>For example, you'd want to do this after doing a <em>git-read-tree</em>, to link +up the stat index details with the proper files.</p></div> </div> -<h2>Using --cacheinfo or --info-only</h2> +<h2 id="_using_cacheinfo_or_info_only">Using --cacheinfo or --info-only</h2> <div class="sectionbody"> -<p><em>--cacheinfo</em> is used to register a file that is not in the +<div class="para"><p><em>--cacheinfo</em> is used to register a file that is not in the current working directory. This is useful for minimum-checkout -merging.</p> -<p>To pretend you have a file with mode and sha1 at path, say:</p> +merging.</p></div> +<div class="para"><p>To pretend you have a file with mode and sha1 at path, say:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git update-index --cacheinfo mode sha1 path</tt></pre> </div></div> -<p><em>--info-only</em> is used to register files without placing them in the object -database. This is useful for status-only repositories.</p> -<p>Both <em>--cacheinfo</em> and <em>--info-only</em> behave similarly: the index is updated +<div class="para"><p><em>--info-only</em> is used to register files without placing them in the object +database. This is useful for status-only repositories.</p></div> +<div class="para"><p>Both <em>--cacheinfo</em> and <em>--info-only</em> behave similarly: the index is updated but the object database isn't. <em>--cacheinfo</em> is useful when the object is in the database but the file isn't available locally. <em>--info-only</em> is useful when the file is available, but you do not wish to update the -object database.</p> +object database.</p></div> </div> -<h2>Using --index-info</h2> +<h2 id="_using_index_info">Using --index-info</h2> <div class="sectionbody"> -<p><tt>--index-info</tt> is a more powerful mechanism that lets you feed +<div class="para"><p><tt>--index-info</tt> is a more powerful mechanism that lets you feed multiple entry definitions from the standard input, and designed -specifically for scripts. It can take inputs of three formats:</p> -<ol> +specifically for scripts. It can take inputs of three formats:</p></div> +<div class="olist"><ol> <li> <p> mode SP sha1 TAB path </p> -<p>The first format is what "git-apply --index-info" +<div class="para"><p>The first format is what "git-apply --index-info" reports, and used to reconstruct a partial tree that is used for phony merge base tree when falling -back on 3-way merge.</p> +back on 3-way merge.</p></div> </li> <li> <p> mode SP type SP sha1 TAB path </p> -<p>The second format is to stuff <tt>git-ls-tree</tt> output -into the index file.</p> +<div class="para"><p>The second format is to stuff <em>git-ls-tree</em> output +into the index file.</p></div> </li> <li> <p> mode SP sha1 SP stage TAB path </p> -<p>This format is to put higher order stages into the -index file and matches <tt>git-ls-files --stage</tt> output.</p> +<div class="para"><p>This format is to put higher order stages into the +index file and matches <em>git-ls-files --stage</em> output.</p></div> </li> -</ol> -<p>To place a higher stage entry to the index, the path should +</ol></div> +<div class="para"><p>To place a higher stage entry to the index, the path should first be removed by feeding a mode=0 entry for the path, and -then feeding necessary input lines in the third format.</p> -<p>For example, starting with this index:</p> +then feeding necessary input lines in the third format.</p></div> +<div class="para"><p>For example, starting with this index:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git ls-files -s 100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz</tt></pre> </div></div> -<p>you can feed the following input to <tt>--index-info</tt>:</p> +<div class="para"><p>you can feed the following input to <tt>--index-info</tt>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git update-index --index-info @@ -582,10 +630,10 @@ 100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz 100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz</tt></pre> </div></div> -<p>The first line of the input feeds 0 as the mode to remove the +<div class="para"><p>The first line of the input feeds 0 as the mode to remove the path; the SHA1 does not matter as long as it is well formatted. Then the second and third line feeds stage 1 and stage 2 entries -for that path. After the above, we would end up with this:</p> +for that path. After the above, we would end up with this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git ls-files -s @@ -593,9 +641,9 @@ 100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz</tt></pre> </div></div> </div> -<h2>Using “assume unchanged” bit</h2> +<h2 id="_using_8220_assume_unchanged_8221_bit">Using “assume unchanged” bit</h2> <div class="sectionbody"> -<p>Many operations in git depend on your filesystem to have an +<div class="para"><p>Many operations in git depend on your filesystem to have an efficient <tt>lstat(2)</tt> implementation, so that <tt>st_mtime</tt> information for working tree files can be cheaply checked to see if the file contents have changed from the version recorded in @@ -607,27 +655,27 @@ see if it has changed — it makes git to omit any checking and assume it has <strong>not</strong> changed. When you make changes to working tree files, you have to explicitly tell git about it by dropping -"assume unchanged" bit, either before or after you modify them.</p> -<p>In order to set "assume unchanged" bit, use <tt>--assume-unchanged</tt> -option. To unset, use <tt>--no-assume-unchanged</tt>.</p> -<p>The command looks at <tt>core.ignorestat</tt> configuration variable. When +"assume unchanged" bit, either before or after you modify them.</p></div> +<div class="para"><p>In order to set "assume unchanged" bit, use <tt>--assume-unchanged</tt> +option. To unset, use <tt>--no-assume-unchanged</tt>.</p></div> +<div class="para"><p>The command looks at <tt>core.ignorestat</tt> configuration variable. When this is true, paths updated with <tt>git update-index paths…</tt> and paths updated with other git commands that update both index and -working tree (e.g. <tt>git-apply --index</tt>, <tt>git-checkout-index -u</tt>, -and <tt>git-read-tree -u</tt>) are automatically marked as "assume +working tree (e.g. <em>git-apply --index</em>, <em>git-checkout-index -u</em>, +and <em>git-read-tree -u</em>) are automatically marked as "assume unchanged". Note that "assume unchanged" bit is <strong>not</strong> set if <tt>git update-index --refresh</tt> finds the working tree file matches the index (use <tt>git update-index --really-refresh</tt> if you want -to mark them as "assume unchanged").</p> +to mark them as "assume unchanged").</p></div> </div> -<h2>Examples</h2> +<h2 id="_examples">Examples</h2> <div class="sectionbody"> -<p>To update and refresh only the files already checked out:</p> +<div class="para"><p>To update and refresh only the files already checked out:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh</tt></pre> </div></div> -<dl> +<div class="vlist"><dl> <dt> On an inefficient filesystem with <tt>core.ignorestat</tt> set </dt> @@ -648,7 +696,7 @@ $ git diff --name-only <b>(9)</b> M foo.c</tt></pre> </div></div> -<ol> +<div class="colist"><ol> <li> <p> forces lstat(2) to set "assume unchanged" bits for paths that match index. @@ -694,46 +742,46 @@ now it checks with lstat(2) and finds it has been changed. </p> </li> -</ol> +</ol></div> </dd> -</dl> +</dl></div> </div> -<h2>Configuration</h2> +<h2 id="_configuration">Configuration</h2> <div class="sectionbody"> -<p>The command honors <tt>core.filemode</tt> configuration variable. If +<div class="para"><p>The command honors <tt>core.filemode</tt> configuration variable. If your repository is on an filesystem whose executable bits are unreliable, this should be set to <em>false</em> (see <a href="git-config.html">git-config(1)</a>). This causes the command to ignore differences in file modes recorded in the index and the file mode on the filesystem if they differ only on executable bit. On such an unfortunate filesystem, you may -need to use <tt>git-update-index --chmod=</tt>.</p> -<p>Quite similarly, if <tt>core.symlinks</tt> configuration variable is set +need to use <em>git-update-index --chmod=</em>.</p></div> +<div class="para"><p>Quite similarly, if <tt>core.symlinks</tt> configuration variable is set to <em>false</em> (see <a href="git-config.html">git-config(1)</a>), symbolic links are checked out as plain files, and this command does not modify a recorded file mode -from symbolic link to regular file.</p> -<p>The command looks at <tt>core.ignorestat</tt> configuration variable. See -<em>Using "assume unchanged" bit</em> section above.</p> +from symbolic link to regular file.</p></div> +<div class="para"><p>The command looks at <tt>core.ignorestat</tt> configuration variable. See +<em>Using "assume unchanged" bit</em> section above.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-config.html">git-config(1)</a>, -<a href="git-add.html">git-add(1)</a></p> +<div class="para"><p><a href="git-config.html">git-config(1)</a>, +<a href="git-add.html">git-add(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:06 UTC +Last updated 2008-07-06 05:17:06 UTC </div> </div> </body> diff --git a/git-update-index.txt b/git-update-index.txt index 999e9a7..a91fd21 100644 --- a/git-update-index.txt +++ b/git-update-index.txt
@@ -31,7 +31,7 @@ See also linkgit:git-add[1] for a more user-friendly way to do some of the most common operations on the index. -The way `git-update-index` handles files it is told about can be modified +The way 'git-update-index' handles files it is told about can be modified using the various options: OPTIONS @@ -53,7 +53,7 @@ -q:: Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes - `git-update-index` continue anyway. + 'git-update-index' continue anyway. --ignore-submodules: Do not try to update submodules. This option is only respected @@ -61,7 +61,7 @@ --unmerged:: If --refresh finds unmerged changes in the index, the default - behavior is to error out. This option makes `git-update-index` + behavior is to error out. This option makes 'git-update-index' continue anyway. --ignore-missing:: @@ -91,7 +91,7 @@ -g:: --again:: - Runs `git-update-index` itself on the paths whose index + Runs 'git-update-index' itself on the paths whose index entries are different from those from the `HEAD` commit. --unresolve:: @@ -109,7 +109,7 @@ --replace:: By default, when a file `path` exists in the index, - `git-update-index` refuses an attempt to add `path/file`. + 'git-update-index' refuses an attempt to add `path/file`. Similarly if a file `path/file` exists, a file `path` cannot be added. With --replace flag, existing entries that conflicts with the entry being added are @@ -145,7 +145,7 @@ can refresh the index for a file that hasn't been changed but where the stat entry is out of date. -For example, you'd want to do this after doing a `git-read-tree`, to link +For example, you'd want to do this after doing a 'git-read-tree', to link up the stat index details with the proper files. Using --cacheinfo or --info-only @@ -186,13 +186,13 @@ . mode SP type SP sha1 TAB path + -The second format is to stuff `git-ls-tree` output +The second format is to stuff 'git-ls-tree' output into the index file. . mode SP sha1 SP stage TAB path + This format is to put higher order stages into the -index file and matches `git-ls-files --stage` output. +index file and matches 'git-ls-files --stage' output. To place a higher stage entry to the index, the path should first be removed by feeding a mode=0 entry for the path, and @@ -249,8 +249,8 @@ The command looks at `core.ignorestat` configuration variable. When this is true, paths updated with `git update-index paths...` and paths updated with other git commands that update both index and -working tree (e.g. `git-apply --index`, `git-checkout-index -u`, -and `git-read-tree -u`) are automatically marked as "assume +working tree (e.g. 'git-apply --index', 'git-checkout-index -u', +and 'git-read-tree -u') are automatically marked as "assume unchanged". Note that "assume unchanged" bit is *not* set if `git update-index --refresh` finds the working tree file matches the index (use `git update-index --really-refresh` if you want @@ -303,7 +303,7 @@ This causes the command to ignore differences in file modes recorded in the index and the file mode on the filesystem if they differ only on executable bit. On such an unfortunate filesystem, you may -need to use `git-update-index --chmod=`. +need to use 'git-update-index --chmod='. Quite similarly, if `core.symlinks` configuration variable is set to 'false' (see linkgit:git-config[1]), symbolic links are checked out
diff --git a/git-upload-archive.html b/git-upload-archive.html index 3d35ea4..a1f0736 100644 --- a/git-upload-archive.html +++ b/git-upload-archive.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-upload-archive(1)</title> </head> @@ -272,19 +320,19 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git upload-archive</em> <directory></p> +<div class="para"><p><em>git upload-archive</em> <directory></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Invoked by <em>git-archive --remote</em> and sends a generated archive to the -other end over the git protocol.</p> -<p>This command is usually not invoked directly by the end user. The UI -for the protocol is on the <tt>git-archive</tt> side, and the program pair -is meant to be used to get an archive from a remote repository.</p> +<div class="para"><p>Invoked by <em>git-archive --remote</em> and sends a generated archive to the +other end over the git protocol.</p></div> +<div class="para"><p>This command is usually not invoked directly by the end user. The UI +for the protocol is on the <em>git-archive</em> side, and the program pair +is meant to be used to get an archive from a remote repository.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <directory> </dt> @@ -293,23 +341,23 @@ The repository to get a tar archive from. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Franck Bui-Huu.</p> +<div class="para"><p>Written by Franck Bui-Huu.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:07 UTC +Last updated 2008-07-06 05:17:06 UTC </div> </div> </body> diff --git a/git-upload-archive.txt b/git-upload-archive.txt index 526e5bd..bbd7617 100644 --- a/git-upload-archive.txt +++ b/git-upload-archive.txt
@@ -16,7 +16,7 @@ other end over the git protocol. This command is usually not invoked directly by the end user. The UI -for the protocol is on the `git-archive` side, and the program pair +for the protocol is on the 'git-archive' side, and the program pair is meant to be used to get an archive from a remote repository. OPTIONS
diff --git a/git-upload-pack.html b/git-upload-pack.html index 8cba080..b869781 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-upload-pack(1)</title> </head> @@ -272,20 +320,20 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git upload-pack</em> [--strict] [--timeout=<n>] <directory></p> +<div class="para"><p><em>git upload-pack</em> [--strict] [--timeout=<n>] <directory></p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Invoked by <tt>git-fetch-pack</tt>, learns what -objects the other side is missing, and sends them after packing.</p> -<p>This command is usually not invoked directly by the end user. -The UI for the protocol is on the <tt>git-fetch-pack</tt> side, and the +<div class="para"><p>Invoked by <em>git-fetch-pack</em>, learns what +objects the other side is missing, and sends them after packing.</p></div> +<div class="para"><p>This command is usually not invoked directly by the end user. +The UI for the protocol is on the <em>git-fetch-pack</em> side, and the program pair is meant to be used to pull updates from a remote -repository. For push operations, see <tt>git-send-pack</tt>.</p> +repository. For push operations, see <em>git-send-pack</em>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --strict </dt> @@ -310,23 +358,23 @@ The repository to sync from. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano.</p> +<div class="para"><p>Documentation by Junio C Hamano.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:07 UTC +Last updated 2008-07-06 05:17:06 UTC </div> </div> </body> diff --git a/git-upload-pack.txt b/git-upload-pack.txt index 52724d4..b8e49dc 100644 --- a/git-upload-pack.txt +++ b/git-upload-pack.txt
@@ -12,13 +12,13 @@ DESCRIPTION ----------- -Invoked by `git-fetch-pack`, learns what +Invoked by 'git-fetch-pack', learns what objects the other side is missing, and sends them after packing. This command is usually not invoked directly by the end user. -The UI for the protocol is on the `git-fetch-pack` side, and the +The UI for the protocol is on the 'git-fetch-pack' side, and the program pair is meant to be used to pull updates from a remote -repository. For push operations, see `git-send-pack`. +repository. For push operations, see 'git-send-pack'. OPTIONS
diff --git a/git-var.html b/git-var.html index e2eea38..c563a9d 100644 --- a/git-var.html +++ b/git-var.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-var(1)</title> </head> @@ -272,15 +320,15 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git var</em> [ -l | <variable> ]</p> +<div class="para"><p><em>git var</em> [ -l | <variable> ]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Prints a git logical variable.</p> +<div class="para"><p>Prints a git logical variable.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -l </dt> @@ -289,12 +337,12 @@ Cause the logical variables to be listed. In addition, all the variables of the git configuration file .git/config are listed as well. (However, the configuration variables listing functionality - is deprecated in favor of <tt>git-config -l</tt>.) + is deprecated in favor of <em>git-config -l</em>.) </p> </dd> -</dl> +</dl></div> </div> -<h2>EXAMPLE</h2> +<h2 id="_example">EXAMPLE</h2> <div class="sectionbody"> <div class="literalblock"> <div class="content"> @@ -302,9 +350,9 @@ Eric W. Biederman <ebiederm@lnxi.com> 1121223278 -0600</tt></pre> </div></div> </div> -<h2>VARIABLES</h2> +<h2 id="_variables">VARIABLES</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> GIT_AUTHOR_IDENT </dt> @@ -321,11 +369,11 @@ The person who put a piece of code into git. </p> </dd> -</dl> +</dl></div> </div> -<h2>Diagnostics</h2> +<h2 id="_diagnostics">Diagnostics</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> You don't exist. Go away! </dt> @@ -350,29 +398,29 @@ The password(5) name field is longer than a giant static buffer. </p> </dd> -</dl> +</dl></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-commit-tree.html">git-commit-tree(1)</a> +<div class="para"><p><a href="git-commit-tree.html">git-commit-tree(1)</a> <a href="git-tag.html">git-tag(1)</a> -<a href="git-config.html">git-config(1)</a></p> +<a href="git-config.html">git-config(1)</a></p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Eric Biederman <ebiederm@xmission.com></p> +<div class="para"><p>Written by Eric Biederman <ebiederm@xmission.com></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Eric Biederman and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Eric Biederman and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:07 UTC +Last updated 2008-07-06 05:17:07 UTC </div> </div> </body> diff --git a/git-var.txt b/git-var.txt index 10d1e19..3647dd6 100644 --- a/git-var.txt +++ b/git-var.txt
@@ -20,7 +20,7 @@ Cause the logical variables to be listed. In addition, all the variables of the git configuration file .git/config are listed as well. (However, the configuration variables listing functionality - is deprecated in favor of `git-config -l`.) + is deprecated in favor of 'git-config -l'.) EXAMPLE --------
diff --git a/git-verify-pack.html b/git-verify-pack.html index 1cb36b7..df25b0f 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-verify-pack(1)</title> </head> @@ -272,17 +320,17 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git verify-pack</em> [-v] [--] <pack>.idx …</p> +<div class="para"><p><em>git verify-pack</em> [-v] [--] <pack>.idx …</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Reads given idx file for packed git archive created with the -<tt>git-pack-objects</tt> command and verifies idx file and the -corresponding pack file.</p> +<div class="para"><p>Reads given idx file for packed git archive created with the +<em>git-pack-objects</em> command and verifies idx file and the +corresponding pack file.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <pack>.idx … </dt> @@ -308,37 +356,37 @@ Do not interpret any more arguments as options. </p> </dd> -</dl> +</dl></div> </div> -<h2>OUTPUT FORMAT</h2> +<h2 id="_output_format">OUTPUT FORMAT</h2> <div class="sectionbody"> -<p>When specifying the -v option the format used is:</p> +<div class="para"><p>When specifying the -v option the format used is:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>SHA1 type size size-in-pack-file offset-in-packfile</tt></pre> </div></div> -<p>for objects that are not deltified in the pack, and</p> +<div class="para"><p>for objects that are not deltified in the pack, and</p></div> <div class="literalblock"> <div class="content"> <pre><tt>SHA1 type size size-in-packfile offset-in-packfile depth base-SHA1</tt></pre> </div></div> -<p>for objects that are deltified.</p> +<div class="para"><p>for objects that are deltified.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano</p> +<div class="para"><p>Documentation by Junio C Hamano</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:07 UTC +Last updated 2008-07-06 05:17:07 UTC </div> </div> </body> diff --git a/git-verify-pack.txt b/git-verify-pack.txt index 4d95c6c..53a9ce3 100644 --- a/git-verify-pack.txt +++ b/git-verify-pack.txt
@@ -14,7 +14,7 @@ DESCRIPTION ----------- Reads given idx file for packed git archive created with the -`git-pack-objects` command and verifies idx file and the +'git-pack-objects' command and verifies idx file and the corresponding pack file. OPTIONS
diff --git a/git-verify-tag.html b/git-verify-tag.html index b0bcaed..6b0e06f 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-verify-tag(1)</title> </head> @@ -272,15 +320,15 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git verify-tag</em> <tag>…</p> +<div class="para"><p><em>git verify-tag</em> <tag>…</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Validates the gpg signature created by <tt>git-tag</tt>.</p> +<div class="para"><p>Validates the gpg signature created by <em>git-tag</em>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <tag> </dt> @@ -289,23 +337,23 @@ SHA1 identifier of a git tag object. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Jan Harkes <jaharkes@cs.cmu.edu> and Eric W. Biederman <ebiederm@xmission.com></p> +<div class="para"><p>Written by Jan Harkes <jaharkes@cs.cmu.edu> and Eric W. Biederman <ebiederm@xmission.com></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:07 UTC +Last updated 2008-07-06 05:17:07 UTC </div> </div> </body> diff --git a/git-verify-tag.txt b/git-verify-tag.txt index de4a89a..ba837df 100644 --- a/git-verify-tag.txt +++ b/git-verify-tag.txt
@@ -11,7 +11,7 @@ DESCRIPTION ----------- -Validates the gpg signature created by `git-tag`. +Validates the gpg signature created by 'git-tag'. OPTIONS -------
diff --git a/git-web--browse.html b/git-web--browse.html index fe72da3..a1e2511 100644 --- a/git-web--browse.html +++ b/git-web--browse.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-web--browse(1)</title> </head> @@ -272,15 +320,15 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git web--browse</em> [OPTIONS] URL/FILE …</p> +<div class="para"><p><em>git web--browse</em> [OPTIONS] URL/FILE …</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This script tries, as much as possible, to display the URLs and FILEs +<div class="para"><p>This script tries, as much as possible, to display the URLs and FILEs that are passed as arguments, as HTML pages in new tabs on an already -opened web browser.</p> -<p>The following browsers (or commands) are currently supported:</p> -<ul> +opened web browser.</p></div> +<div class="para"><p>The following browsers (or commands) are currently supported:</p></div> +<div class="ilist"><ul> <li> <p> firefox (this is the default under X Window when not using KDE) @@ -321,12 +369,12 @@ open (this is the default under Mac OS X GUI) </p> </li> -</ul> -<p>Custom commands may also be specified.</p> +</ul></div> +<div class="para"><p>Custom commands may also be specified.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -b BROWSER </dt> @@ -362,38 +410,38 @@ then its value specify the browser that should be used. </p> </dd> -</dl> +</dl></div> </div> -<h2>CONFIGURATION VARIABLES</h2> +<h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2> <div class="sectionbody"> -<h3>CONF.VAR (from -c option) and web.browser</h3> -<p>The web browser can be specified using a configuration variable passed +<h3 id="_conf_var_from_c_option_and_web_browser">CONF.VAR (from -c option) and web.browser</h3><div style="clear:left"></div> +<div class="para"><p>The web browser can be specified using a configuration variable passed with the -c (or --config) command line option, or the <em>web.browser</em> -configuration variable if the former is not used.</p> -<h3>browser.<tool>.path</h3> -<p>You can explicitly provide a full path to your preferred browser by +configuration variable if the former is not used.</p></div> +<h3 id="_browser_lt_tool_gt_path">browser.<tool>.path</h3><div style="clear:left"></div> +<div class="para"><p>You can explicitly provide a full path to your preferred browser by setting the configuration variable <em>browser.<tool>.path</em>. For example, you can configure the absolute path to firefox by setting -<em>browser.firefox.path</em>. Otherwise, <tt>git-web--browse</tt> assumes the tool -is available in PATH.</p> -<h3>browser.<tool>.cmd</h3> -<p>When the browser, specified by options or configuration variables, is +<em>browser.firefox.path</em>. Otherwise, <em>git-web--browse</em> assumes the tool +is available in PATH.</p></div> +<h3 id="_browser_lt_tool_gt_cmd">browser.<tool>.cmd</h3><div style="clear:left"></div> +<div class="para"><p>When the browser, specified by options or configuration variables, is not among the supported ones, then the corresponding <em>browser.<tool>.cmd</em> configuration variable will be looked up. If this -variable exists then <tt>git-web--browse</tt> will treat the specified tool +variable exists then <em>git-web--browse</em> will treat the specified tool as a custom command and will use a shell eval to run the command with -the URLs passed as arguments.</p> +the URLs passed as arguments.</p></div> </div> -<h2>Note about konqueror</h2> +<h2 id="_note_about_konqueror">Note about konqueror</h2> <div class="sectionbody"> -<p>When <em>konqueror</em> is specified by the a command line option or a +<div class="para"><p>When <em>konqueror</em> is specified by the a command line option or a configuration variable, we launch <em>kfmclient</em> to try to open the HTML -man page on an already opened konqueror in a new tab if possible.</p> -<p>For consistency, we also try such a trick if <em>browser.konqueror.path</em> is +man page on an already opened konqueror in a new tab if possible.</p></div> +<div class="para"><p>For consistency, we also try such a trick if <em>browser.konqueror.path</em> is set to something like <em>A_PATH_TO/konqueror</em>. That means we will try to -launch <em>A_PATH_TO/kfmclient</em> instead.</p> -<p>If you really want to use <em>konqueror</em>, then you can use something like -the following:</p> +launch <em>A_PATH_TO/kfmclient</em> instead.</p></div> +<div class="para"><p>If you really want to use <em>konqueror</em>, then you can use something like +the following:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [web] @@ -402,33 +450,33 @@ [browser "konq"] cmd = A_PATH_TO/konqueror</tt></pre> </div></div> -<h3>Note about git-config --global</h3> -<p>Note that these configuration variables should probably be set using -the <em>--global</em> flag, for example like this:</p> +<h3 id="_note_about_git_config_global">Note about git-config --global</h3><div style="clear:left"></div> +<div class="para"><p>Note that these configuration variables should probably be set using +the <em>--global</em> flag, for example like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git config --global web.browser firefox</tt></pre> </div></div> -<p>as they are probably more user specific than repository specific. -See <a href="git-config.html">git-config(1)</a> for more information about this.</p> +<div class="para"><p>as they are probably more user specific than repository specific. +See <a href="git-config.html">git-config(1)</a> for more information about this.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Christian Couder <chriscool@tuxfamily.org> and the git-list -<git@vger.kernel.org>, based on <tt>git-mergetool</tt> by Theodore Y. Ts'o.</p> +<div class="para"><p>Written by Christian Couder <chriscool@tuxfamily.org> and the git-list +<git@vger.kernel.org>, based on <em>git-mergetool</em> by Theodore Y. Ts'o.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Christian Couder <chriscool@tuxfamily.org> and the -git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Christian Couder <chriscool@tuxfamily.org> and the +git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:08 UTC +Last updated 2008-07-06 05:17:07 UTC </div> </div> </body> diff --git a/git-web--browse.txt b/git-web--browse.txt index fefa6fd..36afad8 100644 --- a/git-web--browse.txt +++ b/git-web--browse.txt
@@ -61,7 +61,7 @@ You can explicitly provide a full path to your preferred browser by setting the configuration variable 'browser.<tool>.path'. For example, you can configure the absolute path to firefox by setting -'browser.firefox.path'. Otherwise, `git-web--browse` assumes the tool +'browser.firefox.path'. Otherwise, 'git-web--browse' assumes the tool is available in PATH. browser.<tool>.cmd @@ -70,7 +70,7 @@ When the browser, specified by options or configuration variables, is not among the supported ones, then the corresponding 'browser.<tool>.cmd' configuration variable will be looked up. If this -variable exists then `git-web--browse` will treat the specified tool +variable exists then 'git-web--browse' will treat the specified tool as a custom command and will use a shell eval to run the command with the URLs passed as arguments. @@ -112,7 +112,7 @@ Author ------ Written by Christian Couder <chriscool@tuxfamily.org> and the git-list -<git@vger.kernel.org>, based on `git-mergetool` by Theodore Y. Ts'o. +<git@vger.kernel.org>, based on 'git-mergetool' by Theodore Y. Ts'o. Documentation -------------
diff --git a/git-whatchanged.html b/git-whatchanged.html index 47989e5..6224874 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-whatchanged(1)</title> </head> @@ -272,19 +320,19 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git whatchanged</em> <option>…</p> +<div class="para"><p><em>git whatchanged</em> <option>…</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Shows commit logs and diff output each commit introduces. The -command internally invokes <tt>git-rev-list</tt> piped to -<tt>git-diff-tree</tt>, and takes command line options for both of -these commands.</p> -<p>This manual page describes only the most frequently used options.</p> +<div class="para"><p>Shows commit logs and diff output each commit introduces. The +command internally invokes <em>git-rev-list</em> piped to +<em>git-diff-tree</em>, and takes command line options for both of +these commands.</p></div> +<div class="para"><p>This manual page describes only the most frequently used options.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -p </dt> @@ -330,8 +378,8 @@ With this flag, show differences to that commit from all of its parents. </p> -<p>However, it is not very useful in general, although it -<strong>is</strong> useful on a file-by-file basis.</p> +<div class="para"><p>However, it is not very useful in general, although it +<strong>is</strong> useful on a file-by-file basis.</p></div> </dd> <dt> --pretty[=<em><format></em>] @@ -343,8 +391,8 @@ <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. When omitted, the format defaults to <em>medium</em>. </p> -<p>Note: you can specify the default pretty format in the repository -configuration (see <a href="git-config.html">git-config(1)</a>).</p> +<div class="para"><p>Note: you can specify the default pretty format in the repository +configuration (see <a href="git-config.html">git-config(1)</a>).</p></div> </dd> <dt> --abbrev-commit @@ -356,8 +404,8 @@ digits can be specified with "--abbrev=<n>" (which also modifies diff output, if it is displayed). </p> -<p>This should make "--pretty=oneline" a whole lot more readable for -people using 80-column terminals.</p> +<div class="para"><p>This should make "--pretty=oneline" a whole lot more readable for +people using 80-column terminals.</p></div> </dd> <dt> --encoding[=<encoding>] @@ -371,11 +419,11 @@ defaults to UTF-8. </p> </dd> -</dl> +</dl></div> </div> -<h2>PRETTY FORMATS</h2> +<h2 id="_pretty_formats">PRETTY FORMATS</h2> <div class="sectionbody"> -<p>If the commit is a merge, and if the pretty-format +<div class="para"><p>If the commit is a merge, and if the pretty-format is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is inserted before the <em>Author:</em> line. This line begins with "Merge: " and the sha1s of ancestral commits are printed, @@ -383,9 +431,9 @@ necessarily be the list of the <strong>direct</strong> parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or -file.</p> -<p>Here are some additional details for each format:</p> -<ul> +file.</p></div> +<div class="para"><p>Here are some additional details for each format:</p></div> +<div class="ilist"><ul> <li> <p> <em>oneline</em> @@ -394,7 +442,7 @@ <div class="content"> <pre><tt><sha1> <title line></tt></pre> </div></div> -<p>This is designed to be as compact as possible.</p> +<div class="para"><p>This is designed to be as compact as possible.</p></div> </li> <li> <p> @@ -418,7 +466,7 @@ <div class="content"> <pre><tt>commit <sha1> Author: <author> -Date: <date></tt></pre> +Date: <author date></tt></pre> </div></div> <div class="literalblock"> <div class="content"> @@ -456,9 +504,9 @@ <div class="content"> <pre><tt>commit <sha1> Author: <author> -AuthorDate: <date & time> +AuthorDate: <author date> Commit: <committer> -CommitDate: <date & time></tt></pre> +CommitDate: <committer date></tt></pre> </div></div> <div class="literalblock"> <div class="content"> @@ -477,7 +525,7 @@ <div class="content"> <pre><tt>From <sha1> <date> From: <author> -Date: <date & time> +Date: <author date> Subject: [PATCH] <title line></tt></pre> </div></div> <div class="literalblock"> @@ -489,31 +537,31 @@ <p> <em>raw</em> </p> -<p>The <em>raw</em> format shows the entire commit exactly as +<div class="para"><p>The <em>raw</em> format shows the entire commit exactly as stored in the commit object. Notably, the SHA1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the true parent commits, without taking grafts nor history -simplification into account.</p> +simplification into account.</p></div> </li> <li> <p> <em>format:</em> </p> -<p>The <em>format:</em> format allows you to specify which information +<div class="para"><p>The <em>format:</em> format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with <em>%n</em> -instead of <em>\n</em>.</p> -<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em> -would show something like this:</p> +instead of <em>\n</em>.</p></div> +<div class="para"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em> +would show something like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago The title was >>t4119: test autocomputing -p<n> for traditional diff input.<< </tt></pre> </div></div> -<p>The placeholders are:</p> -<ul> +<div class="para"><p>The placeholders are:</p></div> +<div class="ilist"><ul> <li> <p> <em>%H</em>: commit hash @@ -664,19 +712,19 @@ <em>%x00</em>: print a byte from a hex code </p> </li> -</ul> +</ul></div> </li> <li> <p> <em>tformat:</em> </p> -<p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it +<div class="para"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it provides "terminator" semantics instead of "separator" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the "oneline" format does. -For example:</p> +For example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log -2 --pretty=format:%h 4da45bef \ @@ -690,11 +738,11 @@ 7134973</tt></pre> </div></div> </li> -</ul> +</ul></div> </div> -<h2>Examples</h2> +<h2 id="_examples">Examples</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> git whatchanged -p v2.6.12.. include/scsi drivers/scsi </dt> @@ -714,24 +762,24 @@ <em>gitk</em> </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and +Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:08 UTC +Last updated 2008-07-06 05:17:07 UTC </div> </div> </body> diff --git a/git-whatchanged.txt b/git-whatchanged.txt index 3b0ea2c..d7fad15 100644 --- a/git-whatchanged.txt +++ b/git-whatchanged.txt
@@ -13,8 +13,8 @@ DESCRIPTION ----------- Shows commit logs and diff output each commit introduces. The -command internally invokes `git-rev-list` piped to -`git-diff-tree`, and takes command line options for both of +command internally invokes 'git-rev-list' piped to +'git-diff-tree', and takes command line options for both of these commands. This manual page describes only the most frequently used options.
diff --git a/git-write-tree.html b/git-write-tree.html index 55a99e9..76c3a63 100644 --- a/git-write-tree.html +++ b/git-write-tree.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-write-tree(1)</title> </head> @@ -272,27 +320,27 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git write-tree</em> [--missing-ok] [--prefix=<prefix>/]</p> +<div class="para"><p><em>git write-tree</em> [--missing-ok] [--prefix=<prefix>/]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Creates a tree object using the current index.</p> -<p>The index must be in a fully merged state.</p> -<p>Conceptually, <tt>git-write-tree</tt> sync()s the current index contents +<div class="para"><p>Creates a tree object using the current index.</p></div> +<div class="para"><p>The index must be in a fully merged state.</p></div> +<div class="para"><p>Conceptually, <em>git-write-tree</em> sync()s the current index contents into a set of tree files. In order to have that match what is actually in your directory right -now, you need to have done a <tt>git-update-index</tt> phase before you did the -<tt>git-write-tree</tt>.</p> +now, you need to have done a <em>git-update-index</em> phase before you did the +<em>git-write-tree</em>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --missing-ok </dt> <dd> <p> - Normally <tt>git-write-tree</tt> ensures that the objects referenced by the + Normally <em>git-write-tree</em> ensures that the objects referenced by the directory exist in the object database. This option disables this check. </p> @@ -307,23 +355,23 @@ for a subproject that is in the named subdirectory. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:08 UTC +Last updated 2008-07-06 05:17:08 UTC </div> </div> </body> diff --git a/git-write-tree.txt b/git-write-tree.txt index 19d979b..26d3850 100644 --- a/git-write-tree.txt +++ b/git-write-tree.txt
@@ -16,17 +16,17 @@ The index must be in a fully merged state. -Conceptually, `git-write-tree` sync()s the current index contents +Conceptually, 'git-write-tree' sync()s the current index contents into a set of tree files. In order to have that match what is actually in your directory right -now, you need to have done a `git-update-index` phase before you did the -`git-write-tree`. +now, you need to have done a 'git-update-index' phase before you did the +'git-write-tree'. OPTIONS ------- --missing-ok:: - Normally `git-write-tree` ensures that the objects referenced by the + Normally 'git-write-tree' ensures that the objects referenced by the directory exist in the object database. This option disables this check.
diff --git a/git.html b/git.html index 298fe7a..97a27e1 100644 --- a/git.html +++ b/git.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git(1)</title> </head> @@ -278,26 +326,26 @@ [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS]</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Git is a fast, scalable, distributed revision control system with an +<div class="para"><p>Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations -and full access to internals.</p> -<p>See <a href="gittutorial.html">gittutorial(7)</a> to get started, then see +and full access to internals.</p></div> +<div class="para"><p>See <a href="gittutorial.html">gittutorial(7)</a> to get started, then see <a href="everyday.html">Everyday Git</a> for a useful minimum set of commands, and "man git-commandname" for documentation of each command. CVS users may also want to read <a href="gitcvs-migration.html">gitcvs-migration(7)</a>. See the <a href="user-manual.html">Git User's Manual</a> for a more in-depth -introduction.</p> -<p>The COMMAND is either a name of a Git command (see below) or an alias -as defined in the configuration file (see <a href="git-config.html">git-config(1)</a>).</p> -<p>Formatted and hyperlinked version of the latest git +introduction.</p></div> +<div class="para"><p>The COMMAND is either a name of a Git command (see below) or an alias +as defined in the configuration file (see <a href="git-config.html">git-config(1)</a>).</p></div> +<div class="para"><p>Formatted and hyperlinked version of the latest git documentation can be viewed at -<tt>http://www.kernel.org/pub/software/scm/git/docs/</tt>.</p> +<tt>http://www.kernel.org/pub/software/scm/git/docs/</tt>.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> --version </dt> @@ -316,10 +364,10 @@ available commands are printed. If a git command is named this option will bring up the manual page for that command. </p> -<p>Other options are available to control how the manual page is +<div class="para"><p>Other options are available to control how the manual page is displayed. See <a href="git-help.html">git-help(1)</a> for more information, -because <em>git --help …</em> is converted internally into <em>git -help …</em>.</p> +because <tt>git --help …</tt> is converted internally into <tt>git +help …</tt>.</p></div> </dd> <dt> --exec-path @@ -328,7 +376,7 @@ <p> Path to wherever your core git programs are installed. This can also be controlled by setting the GIT_EXEC_PATH - environment variable. If no path is given <em>git</em> will print + environment variable. If no path is given, <em>git</em> will print the current setting and then exit. </p> </dd> @@ -389,31 +437,31 @@ directory. </p> </dd> -</dl> +</dl></div> </div> -<h2>FURTHER DOCUMENTATION</h2> +<h2 id="_further_documentation">FURTHER DOCUMENTATION</h2> <div class="sectionbody"> -<p>See the references above to get started using git. The following is -probably more detail than necessary for a first-time user.</p> -<p>The <a href="user-manual.html#git-concepts">git concepts chapter of the +<div class="para"><p>See the references above to get started using git. The following is +probably more detail than necessary for a first-time user.</p></div> +<div class="para"><p>The <a href="user-manual.html#git-concepts">git concepts chapter of the user-manual</a> and <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a> both provide -introductions to the underlying git architecture.</p> -<p>See also the <a href="howto-index.html">howto</a> documents for some useful -examples.</p> -<p>The internals are documented in the -<a href="technical/api-index.html">GIT API documentation</a>.</p> +introductions to the underlying git architecture.</p></div> +<div class="para"><p>See also the <a href="howto-index.html">howto</a> documents for some useful +examples.</p></div> +<div class="para"><p>The internals are documented in the +<a href="technical/api-index.html">GIT API documentation</a>.</p></div> </div> -<h2>GIT COMMANDS</h2> +<h2 id="_git_commands">GIT COMMANDS</h2> <div class="sectionbody"> -<p>We divide git into high level ("porcelain") commands and low level -("plumbing") commands.</p> +<div class="para"><p>We divide git into high level ("porcelain") commands and low level +("plumbing") commands.</p></div> </div> -<h2>High-level commands (porcelain)</h2> +<h2 id="_high_level_commands_porcelain">High-level commands (porcelain)</h2> <div class="sectionbody"> -<p>We separate the porcelain commands into the main commands and some -ancillary user utilities.</p> -<h3>Main porcelain commands</h3> -<dl> +<div class="para"><p>We separate the porcelain commands into the main commands and some +ancillary user utilities.</p></div> +<h3 id="_main_porcelain_commands">Main porcelain commands</h3><div style="clear:left"></div> +<div class="vlist"><dl> <dt> <a href="git-add.html">git-add(1)</a> </dt> @@ -651,7 +699,7 @@ </dt> <dd> <p> - Summarize <em>git log</em> output. + Summarize <em>git-log</em> output. </p> </dd> <dt> @@ -702,10 +750,10 @@ The git repository browser. </p> </dd> -</dl> -<h3>Ancillary Commands</h3> -<p>Manipulators:</p> -<dl> +</dl></div> +<h3 id="_ancillary_commands">Ancillary Commands</h3><div style="clear:left"></div> +<div class="para"><p>Manipulators:</p></div> +<div class="vlist"><dl> <dt> <a href="git-config.html">git-config(1)</a> </dt> @@ -810,9 +858,9 @@ (deprecated) Get and set repository or global options. </p> </dd> -</dl> -<p>Interrogators:</p> -<dl> +</dl></div> +<div class="para"><p>Interrogators:</p></div> +<div class="vlist"><dl> <dt> <a href="git-annotate.html">git-annotate(1)</a> </dt> @@ -925,11 +973,11 @@ Show logs with difference each commit introduces. </p> </dd> -</dl> -<h3>Interacting with Others</h3> -<p>These commands are to interact with foreign SCM and with other -people via patch over e-mail.</p> -<dl> +</dl></div> +<h3 id="_interacting_with_others">Interacting with Others</h3><div style="clear:left"></div> +<div class="para"><p>These commands are to interact with foreign SCM and with other +people via patch over e-mail.</p></div> +<div class="vlist"><dl> <dt> <a href="git-archimport.html">git-archimport(1)</a> </dt> @@ -1002,28 +1050,28 @@ Bidirectional operation between a single Subversion branch and git. </p> </dd> -</dl> +</dl></div> </div> -<h2>Low-level commands (plumbing)</h2> +<h2 id="_low_level_commands_plumbing">Low-level commands (plumbing)</h2> <div class="sectionbody"> -<p>Although git includes its +<div class="para"><p>Although git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about <a href="git-update-index.html">git-update-index(1)</a> and -<a href="git-read-tree.html">git-read-tree(1)</a>.</p> -<p>The interface (input, output, set of options and the semantics) +<a href="git-read-tree.html">git-read-tree(1)</a>.</p></div> +<div class="para"><p>The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the -end user experience.</p> -<p>The following description divides +end user experience.</p></div> +<div class="para"><p>The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between -repositories.</p> -<h3>Manipulation commands</h3> -<dl> +repositories.</p></div> +<h3 id="_manipulation_commands">Manipulation commands</h3><div style="clear:left"></div> +<div class="vlist"><dl> <dt> <a href="git-apply.html">git-apply(1)</a> </dt> @@ -1160,9 +1208,9 @@ Create a tree object from the current index. </p> </dd> -</dl> -<h3>Interrogation commands</h3> -<dl> +</dl></div> +<h3 id="_interrogation_commands">Interrogation commands</h3><div style="clear:left"></div> +<div class="vlist"><dl> <dt> <a href="git-cat-file.html">git-cat-file(1)</a> </dt> @@ -1307,11 +1355,11 @@ Validate packed git archive files. </p> </dd> -</dl> -<p>In general, the interrogate commands do not touch the files in -the working tree.</p> -<h3>Synching repositories</h3> -<dl> +</dl></div> +<div class="para"><p>In general, the interrogate commands do not touch the files in +the working tree.</p></div> +<h3 id="_synching_repositories">Synching repositories</h3><div style="clear:left"></div> +<div class="vlist"><dl> <dt> <a href="git-daemon.html">git-daemon(1)</a> </dt> @@ -1344,10 +1392,10 @@ Update auxiliary info file to help dumb servers. </p> </dd> -</dl> -<p>The following are helper programs used by the above; end users -typically do not use them directly.</p> -<dl> +</dl></div> +<div class="para"><p>The following are helper programs used by the above; end users +typically do not use them directly.</p></div> +<div class="vlist"><dl> <dt> <a href="git-http-fetch.html">git-http-fetch(1)</a> </dt> @@ -1404,11 +1452,11 @@ Send objects packed back to git-fetch-pack. </p> </dd> -</dl> -<h3>Internal helper commands</h3> -<p>These are internal helper commands used by other commands; end -users typically do not use them directly.</p> -<dl> +</dl></div> +<h3 id="_internal_helper_commands">Internal helper commands</h3><div style="clear:left"></div> +<div class="para"><p>These are internal helper commands used by other commands; end +users typically do not use them directly.</p></div> +<div class="vlist"><dl> <dt> <a href="git-check-attr.html">git-check-attr(1)</a> </dt> @@ -1489,14 +1537,14 @@ Filter out empty lines. </p> </dd> -</dl> +</dl></div> </div> -<h2>Configuration Mechanism</h2> +<h2 id="_configuration_mechanism">Configuration Mechanism</h2> <div class="sectionbody"> -<p>Starting from 0.99.9 (actually mid 0.99.8.GIT), <tt>.git/config</tt> file +<div class="para"><p>Starting from 0.99.9 (actually mid 0.99.8.GIT), <tt>.git/config</tt> file is used to hold per-repository configuration options. It is a simple text file modeled after <tt>.ini</tt> format familiar to some -people. Here is an example:</p> +people. Here is an example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt># @@ -1514,12 +1562,12 @@ email = "junkio@twinsun.com" </tt></pre> </div></div> -<p>Various commands read from the configuration file and adjust -their operation accordingly.</p> +<div class="para"><p>Various commands read from the configuration file and adjust +their operation accordingly.</p></div> </div> -<h2>Identifier Terminology</h2> +<h2 id="_identifier_terminology">Identifier Terminology</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <object> </dt> @@ -1592,13 +1640,13 @@ root of the tree structure <tt>GIT_INDEX_FILE</tt> describes. </p> </dd> -</dl> +</dl></div> </div> -<h2>Symbolic Identifiers</h2> +<h2 id="_symbolic_identifiers">Symbolic Identifiers</h2> <div class="sectionbody"> -<p>Any git command accepting any <object> can also use the following -symbolic notation:</p> -<dl> +<div class="para"><p>Any git command accepting any <object> can also use the following +symbolic notation:</p></div> +<div class="vlist"><dl> <dt> HEAD </dt> @@ -1626,29 +1674,29 @@ (i.e. the contents of <tt>$GIT_DIR/refs/heads/<head></tt>). </p> </dd> -</dl> -<p>For a more complete list of ways to spell object names, see -"SPECIFYING REVISIONS" section in <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p> +</dl></div> +<div class="para"><p>For a more complete list of ways to spell object names, see +"SPECIFYING REVISIONS" section in <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p></div> </div> -<h2>File/Directory Structure</h2> +<h2 id="_file_directory_structure">File/Directory Structure</h2> <div class="sectionbody"> -<p>Please see the <a href="gitrepository-layout.html">gitrepository-layout(5)</a> document.</p> -<p>Read <a href="githooks.html">githooks(5)</a> for more details about each hook.</p> -<p>Higher level SCMs may provide and manage additional information in the -<tt>$GIT_DIR</tt>.</p> +<div class="para"><p>Please see the <a href="gitrepository-layout.html">gitrepository-layout(5)</a> document.</p></div> +<div class="para"><p>Read <a href="githooks.html">githooks(5)</a> for more details about each hook.</p></div> +<div class="para"><p>Higher level SCMs may provide and manage additional information in the +<tt>$GIT_DIR</tt>.</p></div> </div> -<h2>Terminology</h2> +<h2 id="_terminology">Terminology</h2> <div class="sectionbody"> -<p>Please see <a href="gitglossary.html">gitglossary(7)</a>.</p> +<div class="para"><p>Please see <a href="gitglossary.html">gitglossary(7)</a>.</p></div> </div> -<h2>Environment Variables</h2> +<h2 id="_environment_variables">Environment Variables</h2> <div class="sectionbody"> -<p>Various git commands use the following environment variables:</p> -<h3>The git Repository</h3> -<p>These environment variables apply to <em>all</em> core git commands. Nb: it +<div class="para"><p>Various git commands use the following environment variables:</p></div> +<h3 id="_the_git_repository">The git Repository</h3><div style="clear:left"></div> +<div class="para"><p>These environment variables apply to <em>all</em> core git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above -git so take care if using Cogito etc.</p> -<dl> +git so take care if using Cogito etc.</p></div> +<div class="vlist"><dl> <dt> <em>GIT_INDEX_FILE</em> </dt> @@ -1704,9 +1752,9 @@ option and the core.worktree configuration variable. </p> </dd> -</dl> -<h3>git Commits</h3> -<dl> +</dl></div> +<h3 id="_git_commits">git Commits</h3><div style="clear:left"></div> +<div class="vlist"><dl> <dt> <em>GIT_AUTHOR_NAME</em> </dt> @@ -1733,9 +1781,9 @@ see <a href="git-commit-tree.html">git-commit-tree(1)</a> </p> </dd> -</dl> -<h3>git Diffs</h3> -<dl> +</dl></div> +<h3 id="_git_diffs">git Diffs</h3><div style="clear:left"></div> +<div class="vlist"><dl> <dt> <em>GIT_DIFF_OPTS</em> </dt> @@ -1761,7 +1809,7 @@ <div class="content"> <pre><tt>path old-file old-hex old-mode new-file new-hex new-mode</tt></pre> </div></div> -<p>where:</p> +<div class="para"><p>where:</p></div> <div class="hlist"><table> <tr> <td class="hlist1"> @@ -1789,17 +1837,17 @@ </td> </tr> </table></div> -<p>The file parameters can point at the user's working file +<div class="para"><p>The file parameters can point at the user's working file (e.g. <tt>new-file</tt> in "git-diff-files"), <tt>/dev/null</tt> (e.g. <tt>old-file</tt> when a new file is added), or a temporary file (e.g. <tt>old-file</tt> in the index). <em>GIT_EXTERNAL_DIFF</em> should not worry about unlinking the -temporary file --- it is removed when <em>GIT_EXTERNAL_DIFF</em> exits.</p> -<p>For a path that is unmerged, <em>GIT_EXTERNAL_DIFF</em> is called with 1 -parameter, <path>.</p> +temporary file --- it is removed when <em>GIT_EXTERNAL_DIFF</em> exits.</p></div> +<div class="para"><p>For a path that is unmerged, <em>GIT_EXTERNAL_DIFF</em> is called with 1 +parameter, <path>.</p></div> </dd> -</dl> -<h3>other</h3> -<dl> +</dl></div> +<h3 id="_other">other</h3><div style="clear:left"></div> +<div class="vlist"><dl> <dt> <em>GIT_MERGE_VERBOSITY</em> </dt> @@ -1825,19 +1873,19 @@ </dt> <dd> <p> - If this environment variable is set then <tt>git-fetch</tt> - and <tt>git-push</tt> will use this command instead - of <tt>ssh</tt> when they need to connect to a remote system. + If this environment variable is set then <em>git-fetch</em> + and <em>git-push</em> will use this command instead + of <em>ssh</em> when they need to connect to a remote system. The <em>$GIT_SSH</em> command will be given exactly two arguments: the <em>username@host</em> (or just <em>host</em>) from the URL and the shell command to execute on that remote system. </p> -<p>To pass options to the program that you want to list in GIT_SSH +<div class="para"><p>To pass options to the program that you want to list in GIT_SSH you will need to wrap the program and options into a shell script, -then set GIT_SSH to refer to the shell script.</p> -<p>Usually it is easier to configure any desired options through your +then set GIT_SSH to refer to the shell script.</p></div> +<div class="para"><p>Usually it is easier to configure any desired options through your personal <tt>.ssh/config</tt> file. Please consult your ssh documentation -for further details.</p> +for further details.</p></div> </dd> <dt> <em>GIT_FLUSH</em> @@ -1845,8 +1893,8 @@ <dd> <p> If this environment variable is set to "1", then commands such - as <tt>git-blame</tt> (in incremental mode), <tt>git-rev-list</tt>, <tt>git-log</tt>, - and <tt>git-whatchanged</tt> will force a flush of the output stream + as <em>git-blame</em> (in incremental mode), <em>git-rev-list</em>, <em>git-log</em>, + and <em>git-whatchanged</em> will force a flush of the output stream after each commit-oriented record have been flushed. If this variable is set to "0", the output of these commands will be done using completely buffered I/O. If this environment variable is @@ -1873,55 +1921,55 @@ into it. </p> </dd> -</dl> +</dl></div> </div> -<h2>Discussion<a id="Discussion"></a></h2> +<h2 id="_discussion_a_id_discussion_a">Discussion<a id="Discussion"></a></h2> <div class="sectionbody"> -<p>More detail on the following is available from the +<div class="para"><p>More detail on the following is available from the <a href="user-manual.html#git-concepts">git concepts chapter of the -user-manual</a> and <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>.</p> -<p>A git project normally consists of a working directory with a ".git" +user-manual</a> and <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>.</p></div> +<div class="para"><p>A git project normally consists of a working directory with a ".git" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an "index" file which links that history to the current contents of the working tree, and named pointers into that history such -as tags and branch heads.</p> -<p>The object database contains objects of three main types: blobs, which +as tags and branch heads.</p></div> +<div class="para"><p>The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree -and some number of parent commits.</p> -<p>The commit, equivalent to what other systems call a "changeset" or +and some number of parent commits.</p></div> +<div class="para"><p>The commit, equivalent to what other systems call a "changeset" or "version", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one -parent represent merges of independent lines of development.</p> -<p>All objects are named by the SHA1 hash of their contents, normally +parent represent merges of independent lines of development.</p></div> +<div class="para"><p>All objects are named by the SHA1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this -purpose.</p> -<p>When first created, objects are stored in individual files, but for -efficiency may later be compressed together into "pack files".</p> -<p>Named pointers called refs mark interesting points in history. A ref +purpose.</p></div> +<div class="para"><p>When first created, objects are stored in individual files, but for +efficiency may later be compressed together into "pack files".</p></div> +<div class="para"><p>Named pointers called refs mark interesting points in history. A ref may contain the SHA1 name of an object or the name of another ref. Refs with names beginning <tt>ref/head/</tt> contain the SHA1 name of the most recent commit (or "head") of a branch under development. SHA1 names of tags of interest are stored under <tt>ref/tags/</tt>. A special ref named -<tt>HEAD</tt> contains the name of the currently checked-out branch.</p> -<p>The index file is initialized with a list of all paths and, for each +<tt>HEAD</tt> contains the name of the currently checked-out branch.</p></div> +<div class="para"><p>The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the -content stored in the index.</p> -<p>The index is also capable of storing multiple entries (called "stages") +content stored in the index.</p></div> +<div class="para"><p>The index is also capable of storing multiple entries (called "stages") for a given pathname. These stages are used to hold the various -unmerged version of a file when a merge is in progress.</p> +unmerged version of a file when a merge is in progress.</p></div> </div> -<h2>Authors</h2> +<h2 id="_authors">Authors</h2> <div class="sectionbody"> -<ul> +<div class="ilist"><ul> <li> <p> git's founding father is Linus Torvalds <torvalds@osdl.org>. @@ -1942,28 +1990,28 @@ General upbringing is handled by the git-list <git@vger.kernel.org>. </p> </li> -</ul> +</ul></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>The documentation for git suite was started by David Greaves +<div class="para"><p>The documentation for git suite was started by David Greaves <david@dgreaves.com>, and later enhanced greatly by the -contributors on the git-list <git@vger.kernel.org>.</p> +contributors on the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gittutorial-2.html">gittutorial-2(7)</a>, +<div class="para"><p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gittutorial-2.html">gittutorial-2(7)</a>, <a href="giteveryday.html">giteveryday(7)</a>, <a href="gitcvs-migration.html">gitcvs-migration(7)</a>, <a href="gitglossary.html">gitglossary(7)</a>, <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>, -<a href="gitcli.html">gitcli(7)</a>, <a href="user-manual.html">The Git User's Manual</a></p> +<a href="gitcli.html">gitcli(7)</a>, <a href="user-manual.html">The Git User's Manual</a></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 03-Jul-2008 09:21:30 UTC +Last updated 2008-07-06 05:17:08 UTC </div> </div> </body> diff --git a/git.txt b/git.txt index 22702c2..adc027c 100644 --- a/git.txt +++ b/git.txt
@@ -43,9 +43,10 @@ branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.5.6.1/git.html[documentation for release 1.5.6.1] +* link:v1.5.6.2/git.html[documentation for release 1.5.6.2] * release notes for + link:RelNotes-1.5.6.2.txt[1.5.6.2]. link:RelNotes-1.5.6.1.txt[1.5.6.1]. link:RelNotes-1.5.6.txt[1.5.6]. @@ -135,13 +136,13 @@ + Other options are available to control how the manual page is displayed. See linkgit:git-help[1] for more information, -because 'git --help ...' is converted internally into 'git -help ...'. +because `git --help ...` is converted internally into `git +help ...`. --exec-path:: Path to wherever your core git programs are installed. This can also be controlled by setting the GIT_EXEC_PATH - environment variable. If no path is given 'git' will print + environment variable. If no path is given, 'git' will print the current setting and then exit. -p:: @@ -483,9 +484,9 @@ a pager. 'GIT_SSH':: - If this environment variable is set then `git-fetch` - and `git-push` will use this command instead - of `ssh` when they need to connect to a remote system. + If this environment variable is set then 'git-fetch' + and 'git-push' will use this command instead + of 'ssh' when they need to connect to a remote system. The '$GIT_SSH' command will be given exactly two arguments: the 'username@host' (or just 'host') from the URL and the shell command to execute on that remote system. @@ -500,8 +501,8 @@ 'GIT_FLUSH':: If this environment variable is set to "1", then commands such - as `git-blame` (in incremental mode), `git-rev-list`, `git-log`, - and `git-whatchanged` will force a flush of the output stream + as 'git-blame' (in incremental mode), 'git-rev-list', 'git-log', + and 'git-whatchanged' will force a flush of the output stream after each commit-oriented record have been flushed. If this variable is set to "0", the output of these commands will be done using completely buffered I/O. If this environment variable is
diff --git a/gitattributes.html b/gitattributes.html index 49663c8..67924d0 100644 --- a/gitattributes.html +++ b/gitattributes.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>gitattributes(5)</title> </head> @@ -272,23 +320,23 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p>$GIT_DIR/info/attributes, gitattributes</p> +<div class="para"><p>$GIT_DIR/info/attributes, gitattributes</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>A <tt>gitattributes</tt> file is a simple text file that gives -<tt>attributes</tt> to pathnames.</p> -<p>Each line in <tt>gitattributes</tt> file is of form:</p> +<div class="para"><p>A <tt>gitattributes</tt> file is a simple text file that gives +<tt>attributes</tt> to pathnames.</p></div> +<div class="para"><p>Each line in <tt>gitattributes</tt> file is of form:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>glob attr1 attr2 ...</tt></pre> </div></div> -<p>That is, a glob pattern followed by an attributes list, +<div class="para"><p>That is, a glob pattern followed by an attributes list, separated by whitespaces. When the glob pattern matches the path in question, the attributes listed on the line are given to -the path.</p> -<p>Each attribute can be in one of these states for a given path:</p> -<dl> +the path.</p></div> +<div class="para"><p>Each attribute can be in one of these states for a given path:</p></div> +<div class="vlist"><dl> <dt> Set </dt> @@ -330,40 +378,40 @@ attribute for the path is said to be Unspecified. </p> </dd> -</dl> -<p>When more than one glob pattern matches the path, a later line +</dl></div> +<div class="para"><p>When more than one glob pattern matches the path, a later line overrides an earlier line. This overriding is done per -attribute.</p> -<p>When deciding what attributes are assigned to a path, git +attribute.</p></div> +<div class="para"><p>When deciding what attributes are assigned to a path, git consults <tt>$GIT_DIR/info/attributes</tt> file (which has the highest precedence), <tt>.gitattributes</tt> file in the same directory as the path in question, and its parent directories (the further the directory that contains <tt>.gitattributes</tt> is from the path in -question, the lower its precedence).</p> -<p>If you wish to affect only a single repository (i.e., to assign +question, the lower its precedence).</p></div> +<div class="para"><p>If you wish to affect only a single repository (i.e., to assign attributes to files that are particular to one user's workflow), then attributes should be placed in the <tt>$GIT_DIR/info/attributes</tt> file. Attributes which should be version-controlled and distributed to other repositories (i.e., attributes of interest to all users) should go into -<tt>.gitattributes</tt> files.</p> -<p>Sometimes you would need to override an setting of an attribute +<tt>.gitattributes</tt> files.</p></div> +<div class="para"><p>Sometimes you would need to override an setting of an attribute for a path to <tt>unspecified</tt> state. This can be done by listing -the name of the attribute prefixed with an exclamation point <tt>!</tt>.</p> +the name of the attribute prefixed with an exclamation point <tt>!</tt>.</p></div> </div> -<h2>EFFECTS</h2> +<h2 id="_effects">EFFECTS</h2> <div class="sectionbody"> -<p>Certain operations by git can be influenced by assigning +<div class="para"><p>Certain operations by git can be influenced by assigning particular attributes to a path. Currently, the following -operations are attributes-aware.</p> -<h3>Checking-out and checking-in</h3> -<p>These attributes affect how the contents stored in the +operations are attributes-aware.</p></div> +<h3 id="_checking_out_and_checking_in">Checking-out and checking-in</h3><div style="clear:left"></div> +<div class="para"><p>These attributes affect how the contents stored in the repository are copied to the working tree files when commands -such as <tt>git-checkout</tt> and <tt>git-merge</tt> run. They also affect how +such as <em>git-checkout</em> and <em>git-merge</em> run. They also affect how git stores the contents you prepare in the working tree in the -repository upon <tt>git-add</tt> and <tt>git-commit</tt>.</p> -<h4><tt>crlf</tt></h4> -<p>This attribute controls the line-ending convention.</p> -<dl> +repository upon <em>git-add</em> and <em>git-commit</em>.</p></div> +<h4 id="_tt_crlf_tt"><tt>crlf</tt></h4> +<div class="para"><p>This attribute controls the line-ending convention.</p></div> +<div class="vlist"><dl> <dt> Set </dt> @@ -405,36 +453,36 @@ <tt>input</tt> for the path. </p> </dd> -</dl> -<p>Any other value set to <tt>crlf</tt> attribute is ignored and git acts -as if the attribute is left unspecified.</p> -<h4>The <tt>core.autocrlf</tt> conversion</h4> -<p>If the configuration variable <tt>core.autocrlf</tt> is false, no -conversion is done.</p> -<p>When <tt>core.autocrlf</tt> is true, it means that the platform wants +</dl></div> +<div class="para"><p>Any other value set to <tt>crlf</tt> attribute is ignored and git acts +as if the attribute is left unspecified.</p></div> +<h4 id="_the_tt_core_autocrlf_tt_conversion">The <tt>core.autocrlf</tt> conversion</h4> +<div class="para"><p>If the configuration variable <tt>core.autocrlf</tt> is false, no +conversion is done.</p></div> +<div class="para"><p>When <tt>core.autocrlf</tt> is true, it means that the platform wants CRLF line endings for files in the working tree, and you want to convert them back to the normal LF line endings when checking -in to the repository.</p> -<p>When <tt>core.autocrlf</tt> is set to "input", line endings are +in to the repository.</p></div> +<div class="para"><p>When <tt>core.autocrlf</tt> is set to "input", line endings are converted to LF upon checkin, but there is no conversion done -upon checkout.</p> -<p>If <tt>core.safecrlf</tt> is set to "true" or "warn", git verifies if +upon checkout.</p></div> +<div class="para"><p>If <tt>core.safecrlf</tt> is set to "true" or "warn", git verifies if the conversion is reversible for the current setting of <tt>core.autocrlf</tt>. For "true", git rejects irreversible conversions; for "warn", git only prints a warning but accepts an irreversible conversion. The safety triggers to prevent such a conversion done to the files in the work tree, but there are a -few exceptions. Even though…</p> -<ul> +few exceptions. Even though…</p></div> +<div class="ilist"><ul> <li> <p> -<tt>git-add</tt> itself does not touch the files in the work tree, the +<em>git-add</em> itself does not touch the files in the work tree, the next checkout would, so the safety triggers; </p> </li> <li> <p> -<tt>git-apply</tt> to update a text file with a patch does touch the files +<em>git-apply</em> to update a text file with a patch does touch the files in the work tree, but the operation is about text files and CRLF conversion is about fixing the line ending inconsistencies, so the safety does not trigger; @@ -442,52 +490,52 @@ </li> <li> <p> -<tt>git-diff</tt> itself does not touch the files in the work tree, it is - often run to inspect the changes you intend to next <tt>git-add</tt>. To +<em>git-diff</em> itself does not touch the files in the work tree, it is + often run to inspect the changes you intend to next <em>git-add</em>. To catch potential problems early, safety triggers. </p> </li> -</ul> -<h4><tt>ident</tt></h4> -<p>When the attribute <tt>ident</tt> is set to a path, git replaces +</ul></div> +<h4 id="_tt_ident_tt"><tt>ident</tt></h4> +<div class="para"><p>When the attribute <tt>ident</tt> is set to a path, git replaces <tt>$Id$</tt> in the blob object with <tt>$Id:</tt>, followed by 40-character hexadecimal blob object name, followed by a dollar sign <tt>$</tt> upon checkout. Any byte sequence that begins with <tt>$Id:</tt> and ends with <tt>$</tt> in the worktree file is replaced -with <tt>$Id$</tt> upon check-in.</p> -<h4><tt>filter</tt></h4> -<p>A <tt>filter</tt> attribute can be set to a string value that names a -filter driver specified in the configuration.</p> -<p>A filter driver consists of a <tt>clean</tt> command and a <tt>smudge</tt> +with <tt>$Id$</tt> upon check-in.</p></div> +<h4 id="_tt_filter_tt"><tt>filter</tt></h4> +<div class="para"><p>A <tt>filter</tt> attribute can be set to a string value that names a +filter driver specified in the configuration.</p></div> +<div class="para"><p>A filter driver consists of a <tt>clean</tt> command and a <tt>smudge</tt> command, either of which can be left unspecified. Upon checkout, when the <tt>smudge</tt> command is specified, the command is fed the blob object from its standard input, and its standard output is used to update the worktree file. Similarly, the <tt>clean</tt> command is used to convert the contents of worktree file -upon checkin.</p> -<p>A missing filter driver definition in the config is not an error -but makes the filter a no-op passthru.</p> -<p>The content filtering is done to massage the content into a +upon checkin.</p></div> +<div class="para"><p>A missing filter driver definition in the config is not an error +but makes the filter a no-op passthru.</p></div> +<div class="para"><p>The content filtering is done to massage the content into a shape that is more convenient for the platform, filesystem, and the user to use. The key phrase here is "more convenient" and not "turning something unusable into usable". In other words, the intent is that if someone unsets the filter driver definition, or does not have the appropriate filter program, the project -should still be usable.</p> -<h4>Interaction between checkin/checkout attributes</h4> -<p>In the check-in codepath, the worktree file is first converted +should still be usable.</p></div> +<h4 id="_interaction_between_checkin_checkout_attributes">Interaction between checkin/checkout attributes</h4> +<div class="para"><p>In the check-in codepath, the worktree file is first converted with <tt>filter</tt> driver (if specified and corresponding driver defined), then the result is processed with <tt>ident</tt> (if specified), and then finally with <tt>crlf</tt> (again, if specified -and applicable).</p> -<p>In the check-out codepath, the blob content is first converted -with <tt>crlf</tt>, and then <tt>ident</tt> and fed to <tt>filter</tt>.</p> -<h3>Generating diff text</h3> -<p>The attribute <tt>diff</tt> affects if <tt>git-diff</tt> generates textual +and applicable).</p></div> +<div class="para"><p>In the check-out codepath, the blob content is first converted +with <tt>crlf</tt>, and then <tt>ident</tt> and fed to <tt>filter</tt>.</p></div> +<h3 id="_generating_diff_text">Generating diff text</h3><div style="clear:left"></div> +<div class="para"><p>The attribute <tt>diff</tt> affects if <em>git-diff</em> generates textual patch for the path or just says <tt>Binary files differ</tt>. It also can affect what line is shown on the hunk header <tt>@@ -k,l +n,m @@</tt> -line.</p> -<dl> +line.</p></div> +<div class="vlist"><dl> <dt> Set </dt> @@ -530,72 +578,72 @@ selection. </p> </dd> -</dl> -<h4>Defining a custom diff driver</h4> -<p>The definition of a diff driver is done in <tt>gitconfig</tt>, not +</dl></div> +<h4 id="_defining_a_custom_diff_driver">Defining a custom diff driver</h4> +<div class="para"><p>The definition of a diff driver is done in <tt>gitconfig</tt>, not <tt>gitattributes</tt> file, so strictly speaking this manual page is a -wrong place to talk about it. However…</p> -<p>To define a custom diff driver <tt>jcdiff</tt>, add a section to your -<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file) like this:</p> +wrong place to talk about it. However…</p></div> +<div class="para"><p>To define a custom diff driver <tt>jcdiff</tt>, add a section to your +<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file) like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[diff "jcdiff"] command = j-c-diff</tt></pre> </div></div> -<p>When git needs to show you a diff for the path with <tt>diff</tt> +<div class="para"><p>When git needs to show you a diff for the path with <tt>diff</tt> attribute set to <tt>jcdiff</tt>, it calls the command you specified with the above configuration, i.e. <tt>j-c-diff</tt>, with 7 parameters, just like <tt>GIT_EXTERNAL_DIFF</tt> program is called. -See <a href="git.html">git(1)</a> for details.</p> -<h4>Defining a custom hunk-header</h4> -<p>Each group of changes (called "hunk") in the textual diff output -is prefixed with a line of the form:</p> +See <a href="git.html">git(1)</a> for details.</p></div> +<h4 id="_defining_a_custom_hunk_header">Defining a custom hunk-header</h4> +<div class="para"><p>Each group of changes (called "hunk") in the textual diff output +is prefixed with a line of the form:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>@@ -k,l +n,m @@ TEXT</tt></pre> </div></div> -<p>The text is called <em>hunk header</em>, and by default a line that +<div class="para"><p>The text is called <em>hunk header</em>, and by default a line that begins with an alphabet, an underscore or a dollar sign is used, -which matches what GNU <tt>diff -p</tt> output uses. This default +which matches what GNU <em>diff -p</em> output uses. This default selection however is not suited for some contents, and you can -use customized pattern to make a selection.</p> -<p>First in .gitattributes, you would assign the <tt>diff</tt> attribute -for paths.</p> +use customized pattern to make a selection.</p></div> +<div class="para"><p>First in .gitattributes, you would assign the <tt>diff</tt> attribute +for paths.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>*.tex diff=tex</tt></pre> </div></div> -<p>Then, you would define "diff.tex.funcname" configuration to +<div class="para"><p>Then, you would define "diff.tex.funcname" configuration to specify a regular expression that matches a line that you would -want to appear as the hunk header, like this:</p> +want to appear as the hunk header, like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[diff "tex"] funcname = "^\\(\\\\\\(sub\\)*section{.*\\)$"</tt></pre> </div></div> -<p>Note. A single level of backslashes are eaten by the +<div class="para"><p>Note. A single level of backslashes are eaten by the configuration file parser, so you would need to double the backslashes; the pattern above picks a line that begins with a backslash, and zero or more occurrences of <tt>sub</tt> followed by -<tt>section</tt> followed by open brace, to the end of line.</p> -<p>There are a few built-in patterns to make this easier, and <tt>tex</tt> +<tt>section</tt> followed by open brace, to the end of line.</p></div> +<div class="para"><p>There are a few built-in patterns to make this easier, and <tt>tex</tt> is one of them, so you do not have to write the above in your configuration file (you still need to enable this with the attribute mechanism, via <tt>.gitattributes</tt>). Another built-in pattern is defined for <tt>java</tt> that defines a pattern suitable -for program text in Java language.</p> -<h3>Performing a three-way merge</h3> -<p>The attribute <tt>merge</tt> affects how three versions of a file is +for program text in Java language.</p></div> +<h3 id="_performing_a_three_way_merge">Performing a three-way merge</h3><div style="clear:left"></div> +<div class="para"><p>The attribute <tt>merge</tt> affects how three versions of a file is merged when a file-level merge is necessary during <tt>git merge</tt>, -and other programs such as <tt>git revert</tt> and <tt>git cherry-pick</tt>.</p> -<dl> +and other programs such as <tt>git revert</tt> and <tt>git cherry-pick</tt>.</p></div> +<div class="vlist"><dl> <dt> Set </dt> <dd> <p> Built-in 3-way merge driver is used to merge the - contents in a way similar to <tt>merge</tt> command of <tt>RCS</tt> + contents in a way similar to <em>merge</em> command of <tt>RCS</tt> suite. This is suitable for ordinary text files. </p> </dd> @@ -634,11 +682,11 @@ requested with "binary". </p> </dd> -</dl> -<h4>Built-in merge drivers</h4> -<p>There are a few built-in low-level merge drivers defined that -can be asked for via the <tt>merge</tt> attribute.</p> -<dl> +</dl></div> +<h4 id="_built_in_merge_drivers">Built-in merge drivers</h4> +<div class="para"><p>There are a few built-in low-level merge drivers defined that +can be asked for via the <tt>merge</tt> attribute.</p></div> +<div class="vlist"><dl> <dt> text </dt> @@ -675,13 +723,13 @@ understand the implications. </p> </dd> -</dl> -<h4>Defining a custom merge driver</h4> -<p>The definition of a merge driver is done in the <tt>.git/config</tt> +</dl></div> +<h4 id="_defining_a_custom_merge_driver">Defining a custom merge driver</h4> +<div class="para"><p>The definition of a merge driver is done in the <tt>.git/config</tt> file, not in the <tt>gitattributes</tt> file, so strictly speaking this -manual page is a wrong place to talk about it. However…</p> -<p>To define a custom merge driver <tt>filfre</tt>, add a section to your -<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file) like this:</p> +manual page is a wrong place to talk about it. However…</p></div> +<div class="para"><p>To define a custom merge driver <tt>filfre</tt>, add a section to your +<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file) like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[merge "filfre"] @@ -689,30 +737,30 @@ driver = filfre %O %A %B recursive = binary</tt></pre> </div></div> -<p>The <tt>merge.*.name</tt> variable gives the driver a human-readable -name.</p> -<p>The <tt>merge.*.driver</tt> variable's value is used to construct a +<div class="para"><p>The <tt>merge.*.name</tt> variable gives the driver a human-readable +name.</p></div> +<div class="para"><p>The <tt>merge.*.driver</tt> variable's value is used to construct a command to run to merge ancestor's version (<tt>%O</tt>), current version (<tt>%A</tt>) and the other branches' version (<tt>%B</tt>). These three tokens are replaced with the names of temporary files that hold the contents of these versions when the command line is -built.</p> -<p>The merge driver is expected to leave the result of the merge in +built.</p></div> +<div class="para"><p>The merge driver is expected to leave the result of the merge in the file named with <tt>%A</tt> by overwriting it, and exit with zero status if it managed to merge them cleanly, or non-zero if there -were conflicts.</p> -<p>The <tt>merge.*.recursive</tt> variable specifies what other merge +were conflicts.</p></div> +<div class="para"><p>The <tt>merge.*.recursive</tt> variable specifies what other merge driver to use when the merge driver is called for an internal merge between common ancestors, when there are more than one. When left unspecified, the driver itself is used for both -internal merge and the final merge.</p> -<h3>Checking whitespace errors</h3> -<h4><tt>whitespace</tt></h4> -<p>The <tt>core.whitespace</tt> configuration variable allows you to define what -<tt>diff</tt> and <tt>apply</tt> should consider whitespace errors for all paths in +internal merge and the final merge.</p></div> +<h3 id="_checking_whitespace_errors">Checking whitespace errors</h3><div style="clear:left"></div> +<h4 id="_tt_whitespace_tt"><tt>whitespace</tt></h4> +<div class="para"><p>The <tt>core.whitespace</tt> configuration variable allows you to define what +<em>diff</em> and <em>apply</em> should consider whitespace errors for all paths in the project (See <a href="git-config.html">git-config(1)</a>). This attribute gives you finer -control per path.</p> -<dl> +control per path.</p></div> +<div class="vlist"><dl> <dt> Set </dt> @@ -748,11 +796,25 @@ variable. </p> </dd> -</dl> +</dl></div> +<h3 id="_creating_an_archive">Creating an archive</h3><div style="clear:left"></div> +<h4 id="_tt_export_ignore_tt"><tt>export-ignore</tt></h4> +<div class="para"><p>Files and directories with the attribute <tt>export-ignore</tt> won't be added to +archive files.</p></div> +<h4 id="_tt_export_subst_tt"><tt>export-subst</tt></h4> +<div class="para"><p>If the attribute <tt>export-subst</tt> is set for a file then git will expand +several placeholders when adding this file to an archive. The +expansion depends on the availability of a commit ID, i.e., if +<a href="git-archive.html">git-archive(1)</a> has been given a tree instead of a commit or a +tag then no replacement will be done. The placeholders are the same +as those for the option <tt>--pretty=format:</tt> of <a href="git-log.html">git-log(1)</a>, +except that they need to be wrapped like this: <tt>$Format:PLACEHOLDERS$</tt> +in the file. E.g. the string <tt>$Format:%H$</tt> will be replaced by the +commit hash.</p></div> </div> -<h2>EXAMPLE</h2> +<h2 id="_example">EXAMPLE</h2> <div class="sectionbody"> -<p>If you have these three <tt>gitattributes</tt> file:</p> +<div class="para"><p>If you have these three <tt>gitattributes</tt> file:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>(in $GIT_DIR/info/attributes) @@ -767,8 +829,8 @@ abc -foo -bar *.c frotz</tt></pre> </div></div> -<p>the attributes given to path <tt>t/abc</tt> are computed as follows:</p> -<ol> +<div class="para"><p>the attributes given to path <tt>t/abc</tt> are computed as follows:</p></div> +<div class="olist"><ol> <li> <p> By examining <tt>t/.gitattributes</tt> (which is in the same @@ -795,8 +857,8 @@ state, and <tt>baz</tt> is unset. </p> </li> -</ol> -<p>As the result, the attributes assignment to <tt>t/abc</tt> becomes:</p> +</ol></div> +<div class="para"><p>As the result, the attributes assignment to <tt>t/abc</tt> becomes:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>foo set to true @@ -805,28 +867,14 @@ merge set to string value "filfre" frotz unspecified</tt></pre> </div></div> -<h3>Creating an archive</h3> -<h4><tt>export-ignore</tt></h4> -<p>Files and directories with the attribute <tt>export-ignore</tt> won't be added to -archive files.</p> -<h4><tt>export-subst</tt></h4> -<p>If the attribute <tt>export-subst</tt> is set for a file then git will expand -several placeholders when adding this file to an archive. The -expansion depends on the availability of a commit ID, i.e., if -<tt>git-archive</tt> has been given a tree instead of a commit or a -tag then no replacement will be done. The placeholders are the same -as those for the option <tt>--pretty=format:</tt> of <a href="git-log.html">git-log(1)</a>, -except that they need to be wrapped like this: <tt>$Format:PLACEHOLDERS$</tt> -in the file. E.g. the string <tt>$Format:%H$</tt> will be replaced by the -commit hash.</p> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:09 UTC +Last updated 2008-07-06 05:17:09 UTC </div> </div> </body> diff --git a/gitattributes.txt b/gitattributes.txt index 124170a..d7b4114 100644 --- a/gitattributes.txt +++ b/gitattributes.txt
@@ -87,9 +87,9 @@ These attributes affect how the contents stored in the repository are copied to the working tree files when commands -such as `git-checkout` and `git-merge` run. They also affect how +such as 'git-checkout' and 'git-merge' run. They also affect how git stores the contents you prepare in the working tree in the -repository upon `git-add` and `git-commit`. +repository upon 'git-add' and 'git-commit'. `crlf` ^^^^^^ @@ -148,16 +148,16 @@ a conversion done to the files in the work tree, but there are a few exceptions. Even though... -- `git-add` itself does not touch the files in the work tree, the +- 'git-add' itself does not touch the files in the work tree, the next checkout would, so the safety triggers; -- `git-apply` to update a text file with a patch does touch the files +- 'git-apply' to update a text file with a patch does touch the files in the work tree, but the operation is about text files and CRLF conversion is about fixing the line ending inconsistencies, so the safety does not trigger; -- `git-diff` itself does not touch the files in the work tree, it is - often run to inspect the changes you intend to next `git-add`. To +- 'git-diff' itself does not touch the files in the work tree, it is + often run to inspect the changes you intend to next 'git-add'. To catch potential problems early, safety triggers. @@ -214,7 +214,7 @@ Generating diff text ~~~~~~~~~~~~~~~~~~~~ -The attribute `diff` affects if `git-diff` generates textual +The attribute `diff` affects if 'git-diff' generates textual patch for the path or just says `Binary files differ`. It also can affect what line is shown on the hunk header `@@ -k,l +n,m @@` line. @@ -278,7 +278,7 @@ The text is called 'hunk header', and by default a line that begins with an alphabet, an underscore or a dollar sign is used, -which matches what GNU `diff -p` output uses. This default +which matches what GNU 'diff -p' output uses. This default selection however is not suited for some contents, and you can use customized pattern to make a selection. @@ -322,7 +322,7 @@ Set:: Built-in 3-way merge driver is used to merge the - contents in a way similar to `merge` command of `RCS` + contents in a way similar to 'merge' command of `RCS` suite. This is suitable for ordinary text files. Unset:: @@ -426,7 +426,7 @@ ^^^^^^^^^^^^ The `core.whitespace` configuration variable allows you to define what -`diff` and `apply` should consider whitespace errors for all paths in +'diff' and 'apply' should consider whitespace errors for all paths in the project (See linkgit:git-config[1]). This attribute gives you finer control per path. @@ -450,6 +450,29 @@ variable. +Creating an archive +~~~~~~~~~~~~~~~~~~~ + +`export-ignore` +^^^^^^^^^^^^^^^ + +Files and directories with the attribute `export-ignore` won't be added to +archive files. + +`export-subst` +^^^^^^^^^^^^^^ + +If the attribute `export-subst` is set for a file then git will expand +several placeholders when adding this file to an archive. The +expansion depends on the availability of a commit ID, i.e., if +linkgit:git-archive[1] has been given a tree instead of a commit or a +tag then no replacement will be done. The placeholders are the same +as those for the option `--pretty=format:` of linkgit:git-log[1], +except that they need to be wrapped like this: `$Format:PLACEHOLDERS$` +in the file. E.g. the string `$Format:%H$` will be replaced by the +commit hash. + + EXAMPLE ------- @@ -499,28 +522,6 @@ ---------------------------------------------------------------- -Creating an archive -~~~~~~~~~~~~~~~~~~~ - -`export-ignore` -^^^^^^^^^^^^^^^ - -Files and directories with the attribute `export-ignore` won't be added to -archive files. - -`export-subst` -^^^^^^^^^^^^^^ - -If the attribute `export-subst` is set for a file then git will expand -several placeholders when adding this file to an archive. The -expansion depends on the availability of a commit ID, i.e., if -`git-archive` has been given a tree instead of a commit or a -tag then no replacement will be done. The placeholders are the same -as those for the option `--pretty=format:` of linkgit:git-log[1], -except that they need to be wrapped like this: `$Format:PLACEHOLDERS$` -in the file. E.g. the string `$Format:%H$` will be replaced by the -commit hash. - GIT ---
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index 4d31bd9..fb37259 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>gitcore-tutorial(7)</title> </head> @@ -272,21 +320,21 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p>git *</p> +<div class="para"><p>git *</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This tutorial explains how to use the "core" git programs to set up and -work with a git repository.</p> -<p>If you just need to use git as a revision control system you may prefer +<div class="para"><p>This tutorial explains how to use the "core" git programs to set up and +work with a git repository.</p></div> +<div class="para"><p>If you just need to use git as a revision control system you may prefer to start with "A Tutorial Introduction to GIT" (<a href="gittutorial.html">gittutorial(7)</a>) or -<a href="user-manual.html">the GIT User Manual</a>.</p> -<p>However, an understanding of these low-level tools can be helpful if -you want to understand git's internals.</p> -<p>The core git is often called "plumbing", with the prettier user +<a href="user-manual.html">the GIT User Manual</a>.</p></div> +<div class="para"><p>However, an understanding of these low-level tools can be helpful if +you want to understand git's internals.</p></div> +<div class="para"><p>The core git is often called "plumbing", with the prettier user interfaces on top of it called "porcelain". You may not want to use the plumbing directly very often, but it can be good to know what the -plumbing does for when the porcelain isn't flushing.</p> +plumbing does for when the porcelain isn't flushing.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -297,43 +345,43 @@ </tr></table> </div> </div> -<h2>Creating a git repository</h2> +<h2 id="_creating_a_git_repository">Creating a git repository</h2> <div class="sectionbody"> -<p>Creating a new git repository couldn't be easier: all git repositories start +<div class="para"><p>Creating a new git repository couldn't be easier: all git repositories start out empty, and the only thing you need to do is find yourself a subdirectory that you want to use as a working tree - either an empty one for a totally new project, or an existing working tree that you want -to import into git.</p> -<p>For our first example, we're going to start a totally new repository from -scratch, with no pre-existing files, and we'll call it <tt>git-tutorial</tt>. +to import into git.</p></div> +<div class="para"><p>For our first example, we're going to start a totally new repository from +scratch, with no pre-existing files, and we'll call it <em>git-tutorial</em>. To start up, create a subdirectory for it, change into that -subdirectory, and initialize the git infrastructure with <tt>git-init</tt>:</p> +subdirectory, and initialize the git infrastructure with <em>git-init</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ mkdir git-tutorial $ cd git-tutorial $ git init</tt></pre> </div></div> -<p>to which git will reply</p> +<div class="para"><p>to which git will reply</p></div> <div class="listingblock"> <div class="content"> <pre><tt>Initialized empty Git repository in .git/</tt></pre> </div></div> -<p>which is just git's way of saying that you haven't been doing anything +<div class="para"><p>which is just git's way of saying that you haven't been doing anything strange, and that it will have created a local <tt>.git</tt> directory setup for your new project. You will now have a <tt>.git</tt> directory, and you can -inspect that with <tt>ls</tt>. For your new empty project, it should show you -three entries, among other things:</p> -<ul> +inspect that with <em>ls</em>. For your new empty project, it should show you +three entries, among other things:</p></div> +<div class="ilist"><ul> <li> <p> a file called <tt>HEAD</tt>, that has <tt>ref: refs/heads/master</tt> in it. This is similar to a symbolic link and points at <tt>refs/heads/master</tt> relative to the <tt>HEAD</tt> file. </p> -<p>Don't worry about the fact that the file that the <tt>HEAD</tt> link points to +<div class="para"><p>Don't worry about the fact that the file that the <tt>HEAD</tt> link points to doesn't even exist yet — you haven't created the commit that will -start your <tt>HEAD</tt> development branch yet.</p> +start your <tt>HEAD</tt> development branch yet.</p></div> </li> <li> <p> @@ -348,22 +396,22 @@ a subdirectory called <tt>refs</tt>, which contains references to objects. </p> </li> -</ul> -<p>In particular, the <tt>refs</tt> subdirectory will contain two other +</ul></div> +<div class="para"><p>In particular, the <tt>refs</tt> subdirectory will contain two other subdirectories, named <tt>heads</tt> and <tt>tags</tt> respectively. They do exactly what their names imply: they contain references to any number of different <em>heads</em> of development (aka <em>branches</em>), and to any <em>tags</em> that you have created to name specific versions in your -repository.</p> -<p>One note: the special <tt>master</tt> head is the default branch, which is +repository.</p></div> +<div class="para"><p>One note: the special <tt>master</tt> head is the default branch, which is why the <tt>.git/HEAD</tt> file was created points to it even if it doesn't yet exist. Basically, the <tt>HEAD</tt> link is supposed to always point to the branch you are working on right now, and you always -start out expecting to work on the <tt>master</tt> branch.</p> -<p>However, this is only a convention, and you can name your branches +start out expecting to work on the <tt>master</tt> branch.</p></div> +<div class="para"><p>However, this is only a convention, and you can name your branches anything you want, and don't have to ever even <em>have</em> a <tt>master</tt> branch. A number of the git tools will assume that <tt>.git/HEAD</tt> is -valid, though.</p> +valid, though.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -388,24 +436,24 @@ after finishing this tutorial.</td> </tr></table> </div> -<p>You have now created your first git repository. Of course, since it's -empty, that's not very useful, so let's start populating it with data.</p> +<div class="para"><p>You have now created your first git repository. Of course, since it's +empty, that's not very useful, so let's start populating it with data.</p></div> </div> -<h2>Populating a git repository</h2> +<h2 id="_populating_a_git_repository">Populating a git repository</h2> <div class="sectionbody"> -<p>We'll keep this simple and stupid, so we'll start off with populating a -few trivial files just to get a feel for it.</p> -<p>Start off with just creating any random files that you want to maintain +<div class="para"><p>We'll keep this simple and stupid, so we'll start off with populating a +few trivial files just to get a feel for it.</p></div> +<div class="para"><p>Start off with just creating any random files that you want to maintain in your git repository. We'll start off with a few bad examples, just to -get a feel for how this works:</p> +get a feel for how this works:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ echo "Hello World" >hello $ echo "Silly example" >example</tt></pre> </div></div> -<p>you have now created two files in your working tree (aka <em>working directory</em>), -but to actually check in your hard work, you will have to go through two steps:</p> -<ul> +<div class="para"><p>you have now created two files in your working tree (aka <em>working directory</em>), +but to actually check in your hard work, you will have to go through two steps:</p></div> +<div class="ilist"><ul> <li> <p> fill in the <em>index</em> file (aka <em>cache</em>) with the information about your @@ -417,50 +465,50 @@ commit that index file as an object. </p> </li> -</ul> -<p>The first step is trivial: when you want to tell git about any changes -to your working tree, you use the <tt>git-update-index</tt> program. That +</ul></div> +<div class="para"><p>The first step is trivial: when you want to tell git about any changes +to your working tree, you use the <em>git-update-index</em> program. That program normally just takes a list of filenames you want to update, but to avoid trivial mistakes, it refuses to add new entries to the index (or remove existing ones) unless you explicitly tell it that you're adding a new entry with the <tt>--add</tt> flag (or removing an entry with the -<tt>--remove</tt>) flag.</p> -<p>So to populate the index with the two files you just created, you can do</p> +<tt>--remove</tt>) flag.</p></div> +<div class="para"><p>So to populate the index with the two files you just created, you can do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git update-index --add hello example</tt></pre> </div></div> -<p>and you have now told git to track those two files.</p> -<p>In fact, as you did that, if you now look into your object directory, +<div class="para"><p>and you have now told git to track those two files.</p></div> +<div class="para"><p>In fact, as you did that, if you now look into your object directory, you'll notice that git will have added two new objects to the object -database. If you did exactly the steps above, you should now be able to do</p> +database. If you did exactly the steps above, you should now be able to do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ ls .git/objects/??/*</tt></pre> </div></div> -<p>and see two files:</p> +<div class="para"><p>and see two files:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>.git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238 .git/objects/f2/4c74a2e500f5ee1332c86b94199f52b1d1d962</tt></pre> </div></div> -<p>which correspond with the objects with names of <tt>557db…</tt> and -<tt>f24c7…</tt> respectively.</p> -<p>If you want to, you can use <tt>git-cat-file</tt> to look at those objects, but -you'll have to use the object name, not the filename of the object:</p> +<div class="para"><p>which correspond with the objects with names of <tt>557db…</tt> and +<tt>f24c7…</tt> respectively.</p></div> +<div class="para"><p>If you want to, you can use <em>git-cat-file</em> to look at those objects, but +you'll have to use the object name, not the filename of the object:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git cat-file -t 557db03de997c86a4a028e1ebd3a1ceb225be238</tt></pre> </div></div> -<p>where the <tt>-t</tt> tells <tt>git-cat-file</tt> to tell you what the "type" of the +<div class="para"><p>where the <tt>-t</tt> tells <em>git-cat-file</em> to tell you what the "type" of the object is. git will tell you that you have a "blob" object (i.e., just a -regular file), and you can see the contents with</p> +regular file), and you can see the contents with</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git cat-file "blob" 557db03</tt></pre> </div></div> -<p>which will print out "Hello World". The object <tt>557db03</tt> is nothing -more than the contents of your file <tt>hello</tt>.</p> +<div class="para"><p>which will print out "Hello World". The object <tt>557db03</tt> is nothing +more than the contents of your file <tt>hello</tt>.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -482,39 +530,39 @@ hexadecimal digits in most places.</td> </tr></table> </div> -<p>Anyway, as we mentioned previously, you normally never actually take a +<div class="para"><p>Anyway, as we mentioned previously, you normally never actually take a look at the objects themselves, and typing long 40-character hex names is not something you'd normally want to do. The above digression -was just to show that <tt>git-update-index</tt> did something magical, and +was just to show that <em>git-update-index</em> did something magical, and actually saved away the contents of your files into the git object -database.</p> -<p>Updating the index did something else too: it created a <tt>.git/index</tt> +database.</p></div> +<div class="para"><p>Updating the index did something else too: it created a <tt>.git/index</tt> file. This is the index that describes your current working tree, and something you should be very aware of. Again, you normally never worry about the index file itself, but you should be aware of the fact that you have not actually really "checked in" your files into git so far, -you've only <strong>told</strong> git about them.</p> -<p>However, since git knows about them, you can now start using some of the -most basic git commands to manipulate the files or look at their status.</p> -<p>In particular, let's not even check in the two files into git yet, we'll -start off by adding another line to <tt>hello</tt> first:</p> +you've only <strong>told</strong> git about them.</p></div> +<div class="para"><p>However, since git knows about them, you can now start using some of the +most basic git commands to manipulate the files or look at their status.</p></div> +<div class="para"><p>In particular, let's not even check in the two files into git yet, we'll +start off by adding another line to <tt>hello</tt> first:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ echo "It's a new day for git" >>hello</tt></pre> </div></div> -<p>and you can now, since you told git about the previous state of <tt>hello</tt>, ask +<div class="para"><p>and you can now, since you told git about the previous state of <tt>hello</tt>, ask git what has changed in the tree compared to your old index, using the -<tt>git-diff-files</tt> command:</p> +<em>git-diff-files</em> command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff-files</tt></pre> </div></div> -<p>Oops. That wasn't very readable. It just spit out its own internal -version of a <tt>diff</tt>, but that internal version really just tells you +<div class="para"><p>Oops. That wasn't very readable. It just spit out its own internal +version of a <em>diff</em>, but that internal version really just tells you that it has noticed that "hello" has been modified, and that the old object -contents it had have been replaced with something else.</p> -<p>To make it readable, we can tell <tt>git-diff-files</tt> to output the -differences as a patch, using the <tt>-p</tt> flag:</p> +contents it had have been replaced with something else.</p></div> +<div class="para"><p>To make it readable, we can tell <em>git-diff-files</em> to output the +differences as a patch, using the <tt>-p</tt> flag:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff-files -p @@ -526,12 +574,12 @@ Hello World +It's a new day for git</tt></pre> </div></div> -<p>i.e. the diff of the change we caused by adding another line to <tt>hello</tt>.</p> -<p>In other words, <tt>git-diff-files</tt> always shows us the difference between +<div class="para"><p>i.e. the diff of the change we caused by adding another line to <tt>hello</tt>.</p></div> +<div class="para"><p>In other words, <em>git-diff-files</em> always shows us the difference between what is recorded in the index, and what is currently in the working -tree. That's very useful.</p> -<p>A common shorthand for <tt>git diff-files -p</tt> is to just write <tt>git -diff</tt>, which will do the same thing.</p> +tree. That's very useful.</p></div> +<div class="para"><p>A common shorthand for <tt>git diff-files -p</tt> is to just write <tt>git +diff</tt>, which will do the same thing.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff @@ -544,196 +592,196 @@ +It's a new day for git</tt></pre> </div></div> </div> -<h2>Committing git state</h2> +<h2 id="_committing_git_state">Committing git state</h2> <div class="sectionbody"> -<p>Now, we want to go to the next stage in git, which is to take the files +<div class="para"><p>Now, we want to go to the next stage in git, which is to take the files that git knows about in the index, and commit them as a real tree. We do that in two phases: creating a <em>tree</em> object, and committing that <em>tree</em> object as a <em>commit</em> object together with an explanation of what the -tree was all about, along with information of how we came to that state.</p> -<p>Creating a tree object is trivial, and is done with <tt>git-write-tree</tt>. +tree was all about, along with information of how we came to that state.</p></div> +<div class="para"><p>Creating a tree object is trivial, and is done with <em>git-write-tree</em>. There are no options or other input: <tt>git write-tree</tt> will take the current index state, and write an object that describes that whole index. In other words, we're now tying together all the different filenames with their contents (and their permissions), and we're -creating the equivalent of a git "directory" object:</p> +creating the equivalent of a git "directory" object:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git write-tree</tt></pre> </div></div> -<p>and this will just output the name of the resulting tree, in this case -(if you have done exactly as I've described) it should be</p> +<div class="para"><p>and this will just output the name of the resulting tree, in this case +(if you have done exactly as I've described) it should be</p></div> <div class="listingblock"> <div class="content"> <pre><tt>8988da15d077d4829fc51d8544c097def6644dbb</tt></pre> </div></div> -<p>which is another incomprehensible object name. Again, if you want to, +<div class="para"><p>which is another incomprehensible object name. Again, if you want to, you can use <tt>git cat-file -t 8988d...</tt> to see that this time the object is not a "blob" object, but a "tree" object (you can also use <tt>git cat-file</tt> to actually output the raw object contents, but you'll see -mainly a binary mess, so that's less interesting).</p> -<p>However — normally you'd never use <tt>git-write-tree</tt> on its own, because +mainly a binary mess, so that's less interesting).</p></div> +<div class="para"><p>However — normally you'd never use <em>git-write-tree</em> on its own, because normally you always commit a tree into a commit object using the -<tt>git-commit-tree</tt> command. In fact, it's easier to not actually use -<tt>git-write-tree</tt> on its own at all, but to just pass its result in as an -argument to <tt>git-commit-tree</tt>.</p> -<p><tt>git-commit-tree</tt> normally takes several arguments — it wants to know +<em>git-commit-tree</em> command. In fact, it's easier to not actually use +<em>git-write-tree</em> on its own at all, but to just pass its result in as an +argument to <em>git-commit-tree</em>.</p></div> +<div class="para"><p><em>git-commit-tree</em> normally takes several arguments — it wants to know what the <em>parent</em> of a commit was, but since this is the first commit ever in this new repository, and it has no parents, we only need to pass in -the object name of the tree. However, <tt>git-commit-tree</tt> also wants to get a +the object name of the tree. However, <em>git-commit-tree</em> also wants to get a commit message on its standard input, and it will write out the resulting -object name for the commit to its standard output.</p> -<p>And this is where we create the <tt>.git/refs/heads/master</tt> file +object name for the commit to its standard output.</p></div> +<div class="para"><p>And this is where we create the <tt>.git/refs/heads/master</tt> file which is pointed at by <tt>HEAD</tt>. This file is supposed to contain the reference to the top-of-tree of the master branch, and since -that's exactly what <tt>git-commit-tree</tt> spits out, we can do this -all with a sequence of simple shell commands:</p> +that's exactly what <em>git-commit-tree</em> spits out, we can do this +all with a sequence of simple shell commands:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ tree=$(git write-tree) $ commit=$(echo 'Initial commit' | git commit-tree $tree) $ git update-ref HEAD $commit</tt></pre> </div></div> -<p>In this case this creates a totally new commit that is not related to +<div class="para"><p>In this case this creates a totally new commit that is not related to anything else. Normally you do this only <strong>once</strong> for a project ever, and -all later commits will be parented on top of an earlier commit.</p> -<p>Again, normally you'd never actually do this by hand. There is a +all later commits will be parented on top of an earlier commit.</p></div> +<div class="para"><p>Again, normally you'd never actually do this by hand. There is a helpful script called <tt>git commit</tt> that will do all of this for you. So you could have just written <tt>git commit</tt> -instead, and it would have done the above magic scripting for you.</p> +instead, and it would have done the above magic scripting for you.</p></div> </div> -<h2>Making a change</h2> +<h2 id="_making_a_change">Making a change</h2> <div class="sectionbody"> -<p>Remember how we did the <tt>git-update-index</tt> on file <tt>hello</tt> and then we +<div class="para"><p>Remember how we did the <em>git-update-index</em> on file <tt>hello</tt> and then we changed <tt>hello</tt> afterward, and could compare the new state of <tt>hello</tt> with the -state we saved in the index file?</p> -<p>Further, remember how I said that <tt>git-write-tree</tt> writes the contents +state we saved in the index file?</p></div> +<div class="para"><p>Further, remember how I said that <em>git-write-tree</em> writes the contents of the <strong>index</strong> file to the tree, and thus what we just committed was in fact the <strong>original</strong> contents of the file <tt>hello</tt>, not the new ones. We did that on purpose, to show the difference between the index state, and the state in the working tree, and how they don't have to match, even -when we commit things.</p> -<p>As before, if we do <tt>git diff-files -p</tt> in our git-tutorial project, +when we commit things.</p></div> +<div class="para"><p>As before, if we do <tt>git diff-files -p</tt> in our git-tutorial project, we'll still see the same difference we saw last time: the index file hasn't changed by the act of committing anything. However, now that we have committed something, we can also learn to use a new command: -<tt>git-diff-index</tt>.</p> -<p>Unlike <tt>git-diff-files</tt>, which showed the difference between the index -file and the working tree, <tt>git-diff-index</tt> shows the differences +<em>git-diff-index</em>.</p></div> +<div class="para"><p>Unlike <em>git-diff-files</em>, which showed the difference between the index +file and the working tree, <em>git-diff-index</em> shows the differences between a committed <strong>tree</strong> and either the index file or the working -tree. In other words, <tt>git-diff-index</tt> wants a tree to be diffed +tree. In other words, <em>git-diff-index</em> wants a tree to be diffed against, and before we did the commit, we couldn't do that, because we -didn't have anything to diff against.</p> -<p>But now we can do</p> +didn't have anything to diff against.</p></div> +<div class="para"><p>But now we can do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff-index -p HEAD</tt></pre> </div></div> -<p>(where <tt>-p</tt> has the same meaning as it did in <tt>git-diff-files</tt>), and it +<div class="para"><p>(where <tt>-p</tt> has the same meaning as it did in <em>git-diff-files</em>), and it will show us the same difference, but for a totally different reason. Now we're comparing the working tree not against the index file, but against the tree we just wrote. It just so happens that those two -are obviously the same, so we get the same result.</p> -<p>Again, because this is a common operation, you can also just shorthand -it with</p> +are obviously the same, so we get the same result.</p></div> +<div class="para"><p>Again, because this is a common operation, you can also just shorthand +it with</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff HEAD</tt></pre> </div></div> -<p>which ends up doing the above for you.</p> -<p>In other words, <tt>git-diff-index</tt> normally compares a tree against the +<div class="para"><p>which ends up doing the above for you.</p></div> +<div class="para"><p>In other words, <em>git-diff-index</em> normally compares a tree against the working tree, but when given the <tt>--cached</tt> flag, it is told to instead compare against just the index cache contents, and ignore the current working tree state entirely. Since we just wrote the index file to HEAD, doing <tt>git diff-index --cached -p HEAD</tt> should thus return -an empty set of differences, and that's exactly what it does.</p> +an empty set of differences, and that's exactly what it does.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <div class="title">Note</div> </td> <td class="content"> -<p><tt>git-diff-index</tt> really always uses the index for its +<div class="para"><p><em>git-diff-index</em> really always uses the index for its comparisons, and saying that it compares a tree against the working tree is thus not strictly accurate. In particular, the list of files to compare (the "meta-data") <strong>always</strong> comes from the index file, regardless of whether the <tt>--cached</tt> flag is used or not. The <tt>--cached</tt> flag really only determines whether the file <strong>contents</strong> to be compared -come from the working tree or not.</p> -<p>This is not hard to understand, as soon as you realize that git simply +come from the working tree or not.</p></div> +<div class="para"><p>This is not hard to understand, as soon as you realize that git simply never knows (or cares) about files that it is not told about explicitly. git will never go <strong>looking</strong> for files to compare, it expects you to tell it what the files are, and that's what the index -is there for.</p> +is there for.</p></div> </td> </tr></table> </div> -<p>However, our next step is to commit the <strong>change</strong> we did, and again, to +<div class="para"><p>However, our next step is to commit the <strong>change</strong> we did, and again, to understand what's going on, keep in mind the difference between "working tree contents", "index file" and "committed tree". We have changes in the working tree that we want to commit, and we always have to work through the index file, so the first thing we need to do is to -update the index cache:</p> +update the index cache:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git update-index hello</tt></pre> </div></div> -<p>(note how we didn't need the <tt>--add</tt> flag this time, since git knew -about the file already).</p> -<p>Note what happens to the different <tt>git-diff-*</tt> versions here. After +<div class="para"><p>(note how we didn't need the <tt>--add</tt> flag this time, since git knew +about the file already).</p></div> +<div class="para"><p>Note what happens to the different <em>git-diff-*</em> versions here. After we've updated <tt>hello</tt> in the index, <tt>git diff-files -p</tt> now shows no differences, but <tt>git diff-index -p HEAD</tt> still *does* show that the current state is different from the state we committed. In fact, now -<tt>git-diff-index</tt> shows the same difference whether we use the <tt>--cached</tt> -flag or not, since now the index is coherent with the working tree.</p> -<p>Now, since we've updated <tt>hello</tt> in the index, we can commit the new +<em>git-diff-index</em> shows the same difference whether we use the <tt>--cached</tt> +flag or not, since now the index is coherent with the working tree.</p></div> +<div class="para"><p>Now, since we've updated <tt>hello</tt> in the index, we can commit the new version. We could do it by writing the tree by hand again, and committing the tree (this time we'd have to use the <tt>-p HEAD</tt> flag to tell commit that the HEAD was the <strong>parent</strong> of the new commit, and that this wasn't an initial commit any more), but you've done that once -already, so let's just use the helpful script this time:</p> +already, so let's just use the helpful script this time:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git commit</tt></pre> </div></div> -<p>which starts an editor for you to write the commit message and tells you -a bit about what you have done.</p> -<p>Write whatever message you want, and all the lines that start with <em>#</em> +<div class="para"><p>which starts an editor for you to write the commit message and tells you +a bit about what you have done.</p></div> +<div class="para"><p>Write whatever message you want, and all the lines that start with <em>#</em> will be pruned out, and the rest will be used as the commit message for the change. If you decide you don't want to commit anything after all at this point (you can continue to edit things and update the index), you can just leave an empty message. Otherwise <tt>git commit</tt> will commit -the change for you.</p> -<p>You've now made your first real git commit. And if you're interested in +the change for you.</p></div> +<div class="para"><p>You've now made your first real git commit. And if you're interested in looking at what <tt>git commit</tt> really does, feel free to investigate: it's a few very simple shell scripts to generate the helpful (?) commit message headers, and a few one-liners that actually do the -commit itself (<tt>git-commit</tt>).</p> +commit itself (<em>git-commit</em>).</p></div> </div> -<h2>Inspecting Changes</h2> +<h2 id="_inspecting_changes">Inspecting Changes</h2> <div class="sectionbody"> -<p>While creating changes is useful, it's even more useful if you can tell +<div class="para"><p>While creating changes is useful, it's even more useful if you can tell later what changed. The most useful command for this is another of the -<tt>diff</tt> family, namely <tt>git-diff-tree</tt>.</p> -<p><tt>git-diff-tree</tt> can be given two arbitrary trees, and it will tell you the +<em>diff</em> family, namely <em>git-diff-tree</em>.</p></div> +<div class="para"><p><em>git-diff-tree</em> can be given two arbitrary trees, and it will tell you the differences between them. Perhaps even more commonly, though, you can give it just a single commit object, and it will figure out the parent of that commit itself, and show the difference directly. Thus, to get -the same diff that we've already seen several times, we can now do</p> +the same diff that we've already seen several times, we can now do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff-tree -p HEAD</tt></pre> </div></div> -<p>(again, <tt>-p</tt> means to show the difference as a human-readable patch), -and it will show what the last commit (in <tt>HEAD</tt>) actually changed.</p> +<div class="para"><p>(again, <tt>-p</tt> means to show the difference as a human-readable patch), +and it will show what the last commit (in <tt>HEAD</tt>) actually changed.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <div class="title">Note</div> </td> <td class="content"> -<p>Here is an ASCII art by Jon Loeliger that illustrates how -various diff-* commands compare things.</p> +<div class="para"><p>Here is an ASCII art by Jon Loeliger that illustrates how +various diff-* commands compare things.</p></div> <div class="literalblock"> <div class="content"> <pre><tt> diff-tree @@ -768,31 +816,31 @@ </td> </tr></table> </div> -<p>More interestingly, you can also give <tt>git-diff-tree</tt> the <tt>--pretty</tt> flag, +<div class="para"><p>More interestingly, you can also give <em>git-diff-tree</em> the <tt>--pretty</tt> flag, which tells it to also show the commit message and author and date of the commit, and you can tell it to show a whole series of diffs. Alternatively, you can tell it to be "silent", and not show the diffs at -all, but just show the actual commit message.</p> -<p>In fact, together with the <tt>git-rev-list</tt> program (which generates a -list of revisions), <tt>git-diff-tree</tt> ends up being a veritable fount of -changes. A trivial (but very useful) script called <tt>git-whatchanged</tt> is +all, but just show the actual commit message.</p></div> +<div class="para"><p>In fact, together with the <em>git-rev-list</em> program (which generates a +list of revisions), <em>git-diff-tree</em> ends up being a veritable fount of +changes. A trivial (but very useful) script called <em>git-whatchanged</em> is included with git which does exactly this, and shows a log of recent -activities.</p> -<p>To see the whole history of our pitiful little git-tutorial project, you -can do</p> +activities.</p></div> +<div class="para"><p>To see the whole history of our pitiful little git-tutorial project, you +can do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log</tt></pre> </div></div> -<p>which shows just the log messages, or if we want to see the log together +<div class="para"><p>which shows just the log messages, or if we want to see the log together with the associated patches use the more complex (and much more -powerful)</p> +powerful)</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git whatchanged -p</tt></pre> </div></div> -<p>and you will see exactly what has changed in the repository over its -short history.</p> +<div class="para"><p>and you will see exactly what has changed in the repository over its +short history.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -802,69 +850,69 @@ If this is a problem because it is huge, you can hide it by setting the log.showroot configuration variable to false. Having this, you can still show it for each command just adding the <tt>--root</tt> option, -which is a flag for <tt>git-diff-tree</tt> accepted by both commands.</td> +which is a flag for <em>git-diff-tree</em> accepted by both commands.</td> </tr></table> </div> -<p>With that, you should now be having some inkling of what git does, and -can explore on your own.</p> +<div class="para"><p>With that, you should now be having some inkling of what git does, and +can explore on your own.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <div class="title">Note</div> </td> <td class="content">Most likely, you are not directly using the core -git Plumbing commands, but using Porcelain such as <tt>git-add</tt>, `git-rm' +git Plumbing commands, but using Porcelain such as <em>git-add</em>, `git-rm' and `git-commit'.</td> </tr></table> </div> </div> -<h2>Tagging a version</h2> +<h2 id="_tagging_a_version">Tagging a version</h2> <div class="sectionbody"> -<p>In git, there are two kinds of tags, a "light" one, and an "annotated tag".</p> -<p>A "light" tag is technically nothing more than a branch, except we put +<div class="para"><p>In git, there are two kinds of tags, a "light" one, and an "annotated tag".</p></div> +<div class="para"><p>A "light" tag is technically nothing more than a branch, except we put it in the <tt>.git/refs/tags/</tt> subdirectory instead of calling it a <tt>head</tt>. -So the simplest form of tag involves nothing more than</p> +So the simplest form of tag involves nothing more than</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git tag my-first-tag</tt></pre> </div></div> -<p>which just writes the current <tt>HEAD</tt> into the <tt>.git/refs/tags/my-first-tag</tt> +<div class="para"><p>which just writes the current <tt>HEAD</tt> into the <tt>.git/refs/tags/my-first-tag</tt> file, after which point you can then use this symbolic name for that -particular state. You can, for example, do</p> +particular state. You can, for example, do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff my-first-tag</tt></pre> </div></div> -<p>to diff your current state against that tag which at this point will +<div class="para"><p>to diff your current state against that tag which at this point will obviously be an empty diff, but if you continue to develop and commit stuff, you can use your tag as an "anchor-point" to see what has changed -since you tagged it.</p> -<p>An "annotated tag" is actually a real git object, and contains not only a +since you tagged it.</p></div> +<div class="para"><p>An "annotated tag" is actually a real git object, and contains not only a pointer to the state you want to tag, but also a small tag name and message, along with optionally a PGP signature that says that yes, you really did that tag. You create these annotated tags with either the <tt>-a</tt> or -<tt>-s</tt> flag to <tt>git tag</tt>:</p> +<tt>-s</tt> flag to <em>git-tag</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git tag -s <tagname></tt></pre> </div></div> -<p>which will sign the current <tt>HEAD</tt> (but you can also give it another +<div class="para"><p>which will sign the current <tt>HEAD</tt> (but you can also give it another argument that specifies the thing to tag, i.e., you could have tagged the -current <tt>mybranch</tt> point by using <tt>git tag <tagname> mybranch</tt>).</p> -<p>You normally only do signed tags for major releases or things +current <tt>mybranch</tt> point by using <tt>git tag <tagname> mybranch</tt>).</p></div> +<div class="para"><p>You normally only do signed tags for major releases or things like that, while the light-weight tags are useful for any marking you want to do — any time you decide that you want to remember a certain point, just create a private tag for it, and you have a nice symbolic -name for the state at that point.</p> +name for the state at that point.</p></div> </div> -<h2>Copying repositories</h2> +<h2 id="_copying_repositories">Copying repositories</h2> <div class="sectionbody"> -<p>git repositories are normally totally self-sufficient and relocatable. +<div class="para"><p>git repositories are normally totally self-sufficient and relocatable. Unlike CVS, for example, there is no separate notion of "repository" and "working tree". A git repository normally <strong>is</strong> the working tree, with the local git information hidden in the <tt>.git</tt> -subdirectory. There is nothing else. What you see is what you got.</p> +subdirectory. There is nothing else. What you see is what you got.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -878,8 +926,8 @@ accurate, but it's a good model for all normal use.</td> </tr></table> </div> -<p>This has two implications:</p> -<ul> +<div class="para"><p>This has two implications:</p></div> +<div class="ilist"><ul> <li> <p> if you grow bored with the tutorial repository you created (or you've @@ -889,247 +937,247 @@ <div class="content"> <pre><tt>$ rm -rf git-tutorial</tt></pre> </div></div> -<p>and it will be gone. There's no external repository, and there's no -history outside the project you created.</p> +<div class="para"><p>and it will be gone. There's no external repository, and there's no +history outside the project you created.</p></div> </li> <li> <p> if you want to move or duplicate a git repository, you can do so. There - is <tt>git clone</tt> command, but if all you want to do is just to + is <em>git-clone</em> command, but if all you want to do is just to create a copy of your repository (with all the full history that went along with it), you can do so with a regular <tt>cp -a git-tutorial new-git-tutorial</tt>. </p> -<p>Note that when you've moved or copied a git repository, your git index +<div class="para"><p>Note that when you've moved or copied a git repository, your git index file (which caches various information, notably some of the "stat" information for the files involved) will likely need to be refreshed. -So after you do a <tt>cp -a</tt> to create a new copy, you'll want to do</p> +So after you do a <tt>cp -a</tt> to create a new copy, you'll want to do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git update-index --refresh</tt></pre> </div></div> -<p>in the new repository to make sure that the index file is up-to-date.</p> +<div class="para"><p>in the new repository to make sure that the index file is up-to-date.</p></div> </li> -</ul> -<p>Note that the second point is true even across machines. You can +</ul></div> +<div class="para"><p>Note that the second point is true even across machines. You can duplicate a remote git repository with <strong>any</strong> regular copy mechanism, be it -<tt>scp</tt>, <tt>rsync</tt> or <tt>wget</tt>.</p> -<p>When copying a remote repository, you'll want to at a minimum update the +<em>scp</em>, <em>rsync</em> or <em>wget</em>.</p></div> +<div class="para"><p>When copying a remote repository, you'll want to at a minimum update the index cache when you do this, and especially with other peoples' repositories you often want to make sure that the index cache is in some known state (you don't know <strong>what</strong> they've done and not yet checked in), -so usually you'll precede the <tt>git-update-index</tt> with a</p> +so usually you'll precede the <em>git-update-index</em> with a</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git read-tree --reset HEAD $ git update-index --refresh</tt></pre> </div></div> -<p>which will force a total index re-build from the tree pointed to by <tt>HEAD</tt>. -It resets the index contents to <tt>HEAD</tt>, and then the <tt>git-update-index</tt> +<div class="para"><p>which will force a total index re-build from the tree pointed to by <tt>HEAD</tt>. +It resets the index contents to <tt>HEAD</tt>, and then the <em>git-update-index</em> makes sure to match up all index entries with the checked-out files. If the original repository had uncommitted changes in its working tree, <tt>git update-index --refresh</tt> notices them and -tells you they need to be updated.</p> -<p>The above can also be written as simply</p> +tells you they need to be updated.</p></div> +<div class="para"><p>The above can also be written as simply</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git reset</tt></pre> </div></div> -<p>and in fact a lot of the common git command combinations can be scripted +<div class="para"><p>and in fact a lot of the common git command combinations can be scripted with the <tt>git xyz</tt> interfaces. You can learn things by just looking at what the various git scripts do. For example, <tt>git reset</tt> used to be -the above two lines implemented in <tt>git-reset</tt>, but some things like -<tt>git-status</tt> and <tt>git-commit</tt> are slightly more complex scripts around -the basic git commands.</p> -<p>Many (most?) public remote repositories will not contain any of +the above two lines implemented in <em>git-reset</em>, but some things like +<em>git-status</em> and <em>git-commit</em> are slightly more complex scripts around +the basic git commands.</p></div> +<div class="para"><p>Many (most?) public remote repositories will not contain any of the checked out files or even an index file, and will <strong>only</strong> contain the actual core git files. Such a repository usually doesn't even have the <tt>.git</tt> subdirectory, but has all the git files directly in the -repository.</p> -<p>To create your own local live copy of such a "raw" git repository, you'd +repository.</p></div> +<div class="para"><p>To create your own local live copy of such a "raw" git repository, you'd first create your own subdirectory for the project, and then copy the raw repository contents into the <tt>.git</tt> directory. For example, to -create your own copy of the git repository, you'd do the following</p> +create your own copy of the git repository, you'd do the following</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ mkdir my-git $ cd my-git $ rsync -rL rsync://rsync.kernel.org/pub/scm/git/git.git/ .git</tt></pre> </div></div> -<p>followed by</p> +<div class="para"><p>followed by</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git read-tree HEAD</tt></pre> </div></div> -<p>to populate the index. However, now you have populated the index, and +<div class="para"><p>to populate the index. However, now you have populated the index, and you have all the git internal files, but you will notice that you don't actually have any of the working tree files to work on. To get -those, you'd check them out with</p> +those, you'd check them out with</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout-index -u -a</tt></pre> </div></div> -<p>where the <tt>-u</tt> flag means that you want the checkout to keep the index +<div class="para"><p>where the <tt>-u</tt> flag means that you want the checkout to keep the index up-to-date (so that you don't have to refresh it afterward), and the <tt>-a</tt> flag means "check out all files" (if you have a stale copy or an older version of a checked out tree you may also need to add the <tt>-f</tt> -flag first, to tell <tt>git-checkout-index</tt> to <strong>force</strong> overwriting of any old -files).</p> -<p>Again, this can all be simplified with</p> +flag first, to tell <em>git-checkout-index</em> to <strong>force</strong> overwriting of any old +files).</p></div> +<div class="para"><p>Again, this can all be simplified with</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git clone rsync://rsync.kernel.org/pub/scm/git/git.git/ my-git $ cd my-git $ git checkout</tt></pre> </div></div> -<p>which will end up doing all of the above for you.</p> -<p>You have now successfully copied somebody else's (mine) remote -repository, and checked it out.</p> +<div class="para"><p>which will end up doing all of the above for you.</p></div> +<div class="para"><p>You have now successfully copied somebody else's (mine) remote +repository, and checked it out.</p></div> </div> -<h2>Creating a new branch</h2> +<h2 id="_creating_a_new_branch">Creating a new branch</h2> <div class="sectionbody"> -<p>Branches in git are really nothing more than pointers into the git +<div class="para"><p>Branches in git are really nothing more than pointers into the git object database from within the <tt>.git/refs/</tt> subdirectory, and as we already discussed, the <tt>HEAD</tt> branch is nothing but a symlink to one of -these object pointers.</p> -<p>You can at any time create a new branch by just picking an arbitrary +these object pointers.</p></div> +<div class="para"><p>You can at any time create a new branch by just picking an arbitrary point in the project history, and just writing the SHA1 name of that object into a file under <tt>.git/refs/heads/</tt>. You can use any filename you want (and indeed, subdirectories), but the convention is that the "normal" branch is called <tt>master</tt>. That's just a convention, though, -and nothing enforces it.</p> -<p>To show that as an example, let's go back to the git-tutorial repository we +and nothing enforces it.</p></div> +<div class="para"><p>To show that as an example, let's go back to the git-tutorial repository we used earlier, and create a branch in it. You do that by simply just -saying that you want to check out a new branch:</p> +saying that you want to check out a new branch:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout -b mybranch</tt></pre> </div></div> -<p>will create a new branch based at the current <tt>HEAD</tt> position, and switch -to it.</p> +<div class="para"><p>will create a new branch based at the current <tt>HEAD</tt> position, and switch +to it.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <div class="title">Note</div> </td> <td class="content"> -<p>If you make the decision to start your new branch at some +<div class="para"><p>If you make the decision to start your new branch at some other point in the history than the current <tt>HEAD</tt>, you can do so by -just telling <tt>git checkout</tt> what the base of the checkout would be. -In other words, if you have an earlier tag or branch, you'd just do</p> +just telling <em>git-checkout</em> what the base of the checkout would be. +In other words, if you have an earlier tag or branch, you'd just do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout -b mybranch earlier-commit</tt></pre> </div></div> -<p>and it would create the new branch <tt>mybranch</tt> at the earlier commit, -and check out the state at that time.</p> +<div class="para"><p>and it would create the new branch <tt>mybranch</tt> at the earlier commit, +and check out the state at that time.</p></div> </td> </tr></table> </div> -<p>You can always just jump back to your original <tt>master</tt> branch by doing</p> +<div class="para"><p>You can always just jump back to your original <tt>master</tt> branch by doing</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout master</tt></pre> </div></div> -<p>(or any other branch-name, for that matter) and if you forget which -branch you happen to be on, a simple</p> +<div class="para"><p>(or any other branch-name, for that matter) and if you forget which +branch you happen to be on, a simple</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ cat .git/HEAD</tt></pre> </div></div> -<p>will tell you where it's pointing. To get the list of branches -you have, you can say</p> +<div class="para"><p>will tell you where it's pointing. To get the list of branches +you have, you can say</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git branch</tt></pre> </div></div> -<p>which used to be nothing more than a simple script around <tt>ls .git/refs/heads</tt>. -There will be an asterisk in front of the branch you are currently on.</p> -<p>Sometimes you may wish to create a new branch _without_ actually -checking it out and switching to it. If so, just use the command</p> +<div class="para"><p>which used to be nothing more than a simple script around <tt>ls .git/refs/heads</tt>. +There will be an asterisk in front of the branch you are currently on.</p></div> +<div class="para"><p>Sometimes you may wish to create a new branch <em>without</em> actually +checking it out and switching to it. If so, just use the command</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git branch <branchname> [startingpoint]</tt></pre> </div></div> -<p>which will simply _create_ the branch, but will not do anything further. +<div class="para"><p>which will simply <em>create</em> the branch, but will not do anything further. You can then later — once you decide that you want to actually develop -on that branch — switch to that branch with a regular <tt>git checkout</tt> -with the branchname as the argument.</p> +on that branch — switch to that branch with a regular <em>git-checkout</em> +with the branchname as the argument.</p></div> </div> -<h2>Merging two branches</h2> +<h2 id="_merging_two_branches">Merging two branches</h2> <div class="sectionbody"> -<p>One of the ideas of having a branch is that you do some (possibly +<div class="para"><p>One of the ideas of having a branch is that you do some (possibly experimental) work in it, and eventually merge it back to the main branch. So assuming you created the above <tt>mybranch</tt> that started out being the same as the original <tt>master</tt> branch, let's make sure we're in -that branch, and do some work there.</p> +that branch, and do some work there.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout mybranch $ echo "Work, work, work" >>hello $ git commit -m "Some work." -i hello</tt></pre> </div></div> -<p>Here, we just added another line to <tt>hello</tt>, and we used a shorthand for +<div class="para"><p>Here, we just added another line to <tt>hello</tt>, and we used a shorthand for doing both <tt>git update-index hello</tt> and <tt>git commit</tt> by just giving the filename directly to <tt>git commit</tt>, with an <tt>-i</tt> flag (it tells git to <em>include</em> that file in addition to what you have done to the index file so far when making the commit). The <tt>-m</tt> flag is to give the -commit log message from the command line.</p> -<p>Now, to make it a bit more interesting, let's assume that somebody else +commit log message from the command line.</p></div> +<div class="para"><p>Now, to make it a bit more interesting, let's assume that somebody else does some work in the original branch, and simulate that by going back -to the master branch, and editing the same file differently there:</p> +to the master branch, and editing the same file differently there:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout master</tt></pre> </div></div> -<p>Here, take a moment to look at the contents of <tt>hello</tt>, and notice how they +<div class="para"><p>Here, take a moment to look at the contents of <tt>hello</tt>, and notice how they don't contain the work we just did in <tt>mybranch</tt> — because that work -hasn't happened in the <tt>master</tt> branch at all. Then do</p> +hasn't happened in the <tt>master</tt> branch at all. Then do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ echo "Play, play, play" >>hello $ echo "Lots of fun" >>example $ git commit -m "Some fun." -i hello example</tt></pre> </div></div> -<p>since the master branch is obviously in a much better mood.</p> -<p>Now, you've got two branches, and you decide that you want to merge the +<div class="para"><p>since the master branch is obviously in a much better mood.</p></div> +<div class="para"><p>Now, you've got two branches, and you decide that you want to merge the work done. Before we do that, let's introduce a cool graphical tool that -helps you view what's going on:</p> +helps you view what's going on:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ gitk --all</tt></pre> </div></div> -<p>will show you graphically both of your branches (that's what the <tt>--all</tt> +<div class="para"><p>will show you graphically both of your branches (that's what the <tt>--all</tt> means: normally it will just show you your current <tt>HEAD</tt>) and their histories. You can also see exactly how they came to be from a common -source.</p> -<p>Anyway, let's exit <tt>gitk</tt> (<tt>^Q</tt> or the File menu), and decide that we want +source.</p></div> +<div class="para"><p>Anyway, let's exit <em>gitk</em> (<tt>^Q</tt> or the File menu), and decide that we want to merge the work we did on the <tt>mybranch</tt> branch into the <tt>master</tt> branch (which is currently our <tt>HEAD</tt> too). To do that, there's a nice -script called <tt>git merge</tt>, which wants to know which branches you want -to resolve and what the merge is all about:</p> +script called <em>git-merge</em>, which wants to know which branches you want +to resolve and what the merge is all about:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git merge -m "Merge work in mybranch" mybranch</tt></pre> </div></div> -<p>where the first argument is going to be used as the commit message if -the merge can be resolved automatically.</p> -<p>Now, in this case we've intentionally created a situation where the +<div class="para"><p>where the first argument is going to be used as the commit message if +the merge can be resolved automatically.</p></div> +<div class="para"><p>Now, in this case we've intentionally created a situation where the merge will need to be fixed up by hand, though, so git will do as much of it as it can automatically (which in this case is just merge the <tt>example</tt> -file, which had no differences in the <tt>mybranch</tt> branch), and say:</p> +file, which had no differences in the <tt>mybranch</tt> branch), and say:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> Auto-merging hello CONFLICT (content): Merge conflict in hello Automatic merge failed; fix up by hand</tt></pre> </div></div> -<p>It tells you that it did an "Automatic merge", which -failed due to conflicts in <tt>hello</tt>.</p> -<p>Not to worry. It left the (trivial) conflict in <tt>hello</tt> in the same form you +<div class="para"><p>It tells you that it did an "Automatic merge", which +failed due to conflicts in <tt>hello</tt>.</p></div> +<div class="para"><p>Not to worry. It left the (trivial) conflict in <tt>hello</tt> in the same form you should already be well used to if you've ever used CVS, so let's just open <tt>hello</tt> in our editor (whatever that may be), and fix it up somehow. -I'd suggest just making it so that <tt>hello</tt> contains all four lines:</p> +I'd suggest just making it so that <tt>hello</tt> contains all four lines:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>Hello World @@ -1137,22 +1185,22 @@ Play, play, play Work, work, work</tt></pre> </div></div> -<p>and once you're happy with your manual merge, just do a</p> +<div class="para"><p>and once you're happy with your manual merge, just do a</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git commit -i hello</tt></pre> </div></div> -<p>which will very loudly warn you that you're now committing a merge +<div class="para"><p>which will very loudly warn you that you're now committing a merge (which is correct, so never mind), and you can write a small merge -message about your adventures in <tt>git-merge</tt>-land.</p> -<p>After you're done, start up <tt>gitk --all</tt> to see graphically what the +message about your adventures in <em>git-merge</em>-land.</p></div> +<div class="para"><p>After you're done, start up <tt>gitk --all</tt> to see graphically what the history looks like. Notice that <tt>mybranch</tt> still exists, and you can switch to it, and continue to work with it if you want to. The <tt>mybranch</tt> branch will not contain the merge, but next time you merge it from the <tt>master</tt> branch, git will know how you merged it, so you'll not -have to do _that_ merge again.</p> -<p>Another useful tool, especially if you do not always work in X-Window -environment, is <tt>git show-branch</tt>.</p> +have to do <em>that</em> merge again.</p></div> +<div class="para"><p>Another useful tool, especially if you do not always work in X-Window +environment, is <tt>git show-branch</tt>.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show-branch --topo-order --more=1 master mybranch @@ -1163,7 +1211,7 @@ *+ [mybranch] Some work. * [master^] Some fun.</tt></pre> </div></div> -<p>The first two lines indicate that it is showing the two branches +<div class="para"><p>The first two lines indicate that it is showing the two branches and the first line of the commit log message from their top-of-the-tree commits, you are currently on <tt>master</tt> branch (notice the asterisk <tt>*</tt> character), and the first column for @@ -1180,13 +1228,13 @@ name the commit. In the above example, <em>master</em> and <em>mybranch</em> are branch heads. <em>master^</em> is the first parent of <em>master</em> branch head. Please see <a href="git-rev-parse.html">git-rev-parse(1)</a> if you want to -see more complex cases.</p> +see more complex cases.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <div class="title">Note</div> </td> -<td class="content">Without the <em>--more=1</em> option, <tt>git-show-branch</tt> would not output the +<td class="content">Without the <em>--more=1</em> option, <em>git-show-branch</em> would not output the <em>[master^]</em> commit, as <em>[mybranch]</em> commit is a common ancestor of both <em>master</em> and <em>mybranch</em> tips. Please see <a href="git-show-branch.html">git-show-branch(1)</a> for details.</td> @@ -1198,22 +1246,22 @@ <div class="title">Note</div> </td> <td class="content">If there were more commits on the <em>master</em> branch after the merge, the -merge commit itself would not be shown by <tt>git-show-branch</tt> by +merge commit itself would not be shown by <em>git-show-branch</em> by default. You would need to provide <em>--sparse</em> option to make the merge commit visible in this case.</td> </tr></table> </div> -<p>Now, let's pretend you are the one who did all the work in +<div class="para"><p>Now, let's pretend you are the one who did all the work in <tt>mybranch</tt>, and the fruit of your hard work has finally been merged to the <tt>master</tt> branch. Let's go back to <tt>mybranch</tt>, and run -<tt>git-merge</tt> to get the "upstream changes" back to your branch.</p> +<em>git-merge</em> to get the "upstream changes" back to your branch.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout mybranch $ git merge -m "Merge upstream changes." master</tt></pre> </div></div> -<p>This outputs something like this (the actual commit object names -would be different)</p> +<div class="para"><p>This outputs something like this (the actual commit object names +would be different)</p></div> <div class="listingblock"> <div class="content"> <pre><tt>Updating from ae3a2da... to a80b4aa.... @@ -1222,13 +1270,13 @@ hello | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)</tt></pre> </div></div> -<p>Because your branch did not contain anything more than what are +<div class="para"><p>Because your branch did not contain anything more than what are already merged into the <tt>master</tt> branch, the merge operation did not actually do a merge. Instead, it just updated the top of the tree of your branch to that of the <tt>master</tt> branch. This is -often called <em>fast forward</em> merge.</p> -<p>You can run <tt>gitk --all</tt> again to see how the commit ancestry -looks like, or run <tt>show-branch</tt>, which tells you this.</p> +often called <em>fast forward</em> merge.</p></div> +<div class="para"><p>You can run <tt>gitk --all</tt> again to see how the commit ancestry +looks like, or run <em>show-branch</em>, which tells you this.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show-branch master mybranch @@ -1238,23 +1286,23 @@ -- [master] Merge work in mybranch</tt></pre> </div></div> </div> -<h2>Merging external work</h2> +<h2 id="_merging_external_work">Merging external work</h2> <div class="sectionbody"> -<p>It's usually much more common that you merge with somebody else than +<div class="para"><p>It's usually much more common that you merge with somebody else than merging with your own branches, so it's worth pointing out that git makes that very easy too, and in fact, it's not that different from -doing a <tt>git merge</tt>. In fact, a remote merge ends up being nothing +doing a <em>git-merge</em>. In fact, a remote merge ends up being nothing more than "fetch the work from a remote repository into a temporary tag" -followed by a <tt>git merge</tt>.</p> -<p>Fetching from a remote repository is done by, unsurprisingly, -<tt>git fetch</tt>:</p> +followed by a <em>git-merge</em>.</p></div> +<div class="para"><p>Fetching from a remote repository is done by, unsurprisingly, +<em>git-fetch</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git fetch <remote-repository></tt></pre> </div></div> -<p>One of the following transports can be used to name the -repository to download from:</p> -<dl> +<div class="para"><p>One of the following transports can be used to name the +repository to download from:</p></div> +<div class="vlist"><dl> <dt> Rsync </dt> @@ -1262,7 +1310,7 @@ <p> <tt>rsync://remote.machine/path/to/repo.git/</tt> </p> -<p>Rsync transport is usable for both uploading and downloading, +<div class="para"><p>Rsync transport is usable for both uploading and downloading, but is completely unaware of what git does, and can produce unexpected results when you download from the public repository while the repository owner is uploading into it via <tt>rsync</tt> @@ -1271,7 +1319,7 @@ before uploading the files in <tt>objects/</tt> — the downloader would obtain head commit object name while that object itself is still not available in the repository. For this reason, it is -considered deprecated.</p> +considered deprecated.</p></div> </dd> <dt> SSH @@ -1280,13 +1328,13 @@ <p> <tt>remote.machine:/path/to/repo.git/</tt> or </p> -<p><tt>ssh://remote.machine/path/to/repo.git/</tt></p> -<p>This transport can be used for both uploading and downloading, +<div class="para"><p><tt>ssh://remote.machine/path/to/repo.git/</tt></p></div> +<div class="para"><p>This transport can be used for both uploading and downloading, and requires you to have a log-in privilege over <tt>ssh</tt> to the remote machine. It finds out the set of objects the other side lacks by exchanging the head commits both ends have and transfers (close to) minimum set of objects. It is by far the -most efficient way to exchange git objects between repositories.</p> +most efficient way to exchange git objects between repositories.</p></div> </dd> <dt> Local directory @@ -1295,9 +1343,9 @@ <p> <tt>/path/to/repo.git/</tt> </p> -<p>This transport is the same as SSH transport but uses <tt>sh</tt> to run +<div class="para"><p>This transport is the same as SSH transport but uses <em>sh</em> to run both ends on the local machine instead of running other end on -the remote machine via <tt>ssh</tt>.</p> +the remote machine via <em>ssh</em>.</p></div> </dd> <dt> git Native @@ -1306,9 +1354,9 @@ <p> <tt>git://remote.machine/path/to/repo.git/</tt> </p> -<p>This transport was designed for anonymous downloading. Like SSH +<div class="para"><p>This transport was designed for anonymous downloading. Like SSH transport, it finds out the set of objects the downstream side -lacks and transfers (close to) minimum set of objects.</p> +lacks and transfers (close to) minimum set of objects.</p></div> </dd> <dt> HTTP(S) @@ -1317,7 +1365,7 @@ <p> <tt>http://remote.machine/path/to/repo.git/</tt> </p> -<p>Downloader from http and https URL +<div class="para"><p>Downloader from http and https URL first obtains the topmost commit object name from the remote site by looking at the specified refname under <tt>repo.git/refs/</tt> directory, and then tries to obtain the @@ -1326,26 +1374,26 @@ commit object to find out its parent commits and the associate tree object; it repeats this process until it gets all the necessary objects. Because of this behavior, they are -sometimes also called <em>commit walkers</em>.</p> -<p>The <em>commit walkers</em> are sometimes also called <em>dumb +sometimes also called <em>commit walkers</em>.</p></div> +<div class="para"><p>The <em>commit walkers</em> are sometimes also called <em>dumb transports</em>, because they do not require any git aware smart server like git Native transport does. Any stock HTTP server that does not even support directory index would suffice. But -you must prepare your repository with <tt>git-update-server-info</tt> -to help dumb transport downloaders.</p> +you must prepare your repository with <em>git-update-server-info</em> +to help dumb transport downloaders.</p></div> </dd> -</dl> -<p>Once you fetch from the remote repository, you <tt>merge</tt> that -with your current branch.</p> -<p>However — it's such a common thing to <tt>fetch</tt> and then +</dl></div> +<div class="para"><p>Once you fetch from the remote repository, you <tt>merge</tt> that +with your current branch.</p></div> +<div class="para"><p>However — it's such a common thing to <tt>fetch</tt> and then immediately <tt>merge</tt>, that it's called <tt>git pull</tt>, and you can -simply do</p> +simply do</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git pull <remote-repository></tt></pre> </div></div> -<p>and optionally give a branch-name for the remote end as a second -argument.</p> +<div class="para"><p>and optionally give a branch-name for the remote end as a second +argument.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -1353,7 +1401,7 @@ </td> <td class="content">You could do without using any branches at all, by keeping as many local repositories as you would like to have -branches, and merging between them with <tt>git pull</tt>, just like +branches, and merging between them with <em>git-pull</em>, just like you merge between branches. The advantage of this approach is that it lets you keep a set of files for each <tt>branch</tt> checked out and you may find it easier to switch back and forth if you @@ -1362,17 +1410,17 @@ multiple working trees, but disk space is cheap these days.</td> </tr></table> </div> -<p>It is likely that you will be pulling from the same remote +<div class="para"><p>It is likely that you will be pulling from the same remote repository from time to time. As a short hand, you can store the remote repository URL in the local repository's config file -like this:</p> +like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git config remote.linus.url http://www.kernel.org/pub/scm/git/git.git/</tt></pre> </div></div> -<p>and use the "linus" keyword with <tt>git pull</tt> instead of the full URL.</p> -<p>Examples.</p> -<ol> +<div class="para"><p>and use the "linus" keyword with <em>git-pull</em> instead of the full URL.</p></div> +<div class="para"><p>Examples.</p></div> +<div class="olist"><ol> <li> <p> <tt>git pull linus</tt> @@ -1383,9 +1431,9 @@ <tt>git pull linus tag v0.99.1</tt> </p> </li> -</ol> -<p>the above are equivalent to:</p> -<ol> +</ol></div> +<div class="para"><p>the above are equivalent to:</p></div> +<div class="olist"><ol> <li> <p> <tt>git pull http://www.kernel.org/pub/scm/git/git.git/ HEAD</tt> @@ -1396,18 +1444,18 @@ <tt>git pull http://www.kernel.org/pub/scm/git/git.git/ tag v0.99.1</tt> </p> </li> -</ol> +</ol></div> </div> -<h2>How does the merge work?</h2> +<h2 id="_how_does_the_merge_work">How does the merge work?</h2> <div class="sectionbody"> -<p>We said this tutorial shows what plumbing does to help you cope +<div class="para"><p>We said this tutorial shows what plumbing does to help you cope with the porcelain that isn't flushing, but we so far did not talk about how the merge really works. If you are following this tutorial the first time, I'd suggest to skip to "Publishing -your work" section and come back here later.</p> -<p>OK, still with me? To give us an example to look at, let's go +your work" section and come back here later.</p></div> +<div class="para"><p>OK, still with me? To give us an example to look at, let's go back to the earlier repository with "hello" and "example" file, -and bring ourselves back to the pre-merge state:</p> +and bring ourselves back to the pre-merge state:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show-branch --more=2 master mybranch @@ -1418,9 +1466,9 @@ +* [master^2] Some work. +* [master^] Some fun.</tt></pre> </div></div> -<p>Remember, before running <tt>git merge</tt>, our <tt>master</tt> head was at +<div class="para"><p>Remember, before running <em>git-merge</em>, our <tt>master</tt> head was at "Some fun." commit, while our <tt>mybranch</tt> head was at "Some -work." commit.</p> +work." commit.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout mybranch @@ -1428,7 +1476,7 @@ $ git checkout master $ git reset --hard master^</tt></pre> </div></div> -<p>After rewinding, the commit structure should look like this:</p> +<div class="para"><p>After rewinding, the commit structure should look like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show-branch @@ -1439,31 +1487,31 @@ * [master] Some fun. *+ [mybranch^] New day.</tt></pre> </div></div> -<p>Now we are ready to experiment with the merge by hand.</p> -<p><tt>git merge</tt> command, when merging two branches, uses 3-way merge +<div class="para"><p>Now we are ready to experiment with the merge by hand.</p></div> +<div class="para"><p><tt>git merge</tt> command, when merging two branches, uses 3-way merge algorithm. First, it finds the common ancestor between them. -The command it uses is <tt>git-merge-base</tt>:</p> +The command it uses is <em>git-merge-base</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ mb=$(git merge-base HEAD mybranch)</tt></pre> </div></div> -<p>The command writes the commit object name of the common ancestor +<div class="para"><p>The command writes the commit object name of the common ancestor to the standard output, so we captured its output to a variable, because we will be using it in the next step. By the way, the common ancestor commit is the "New day." commit in this case. You can -tell it by:</p> +tell it by:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git name-rev $mb my-first-tag</tt></pre> </div></div> -<p>After finding out a common ancestor commit, the second step is -this:</p> +<div class="para"><p>After finding out a common ancestor commit, the second step is +this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git read-tree -m -u $mb HEAD mybranch</tt></pre> </div></div> -<p>This is the same <tt>git-read-tree</tt> command we have already seen, +<div class="para"><p>This is the same <em>git-read-tree</em> command we have already seen, but it takes three trees, unlike previous examples. This reads the contents of each tree into different <em>stage</em> in the index file (the first tree goes to stage 1, the second to stage 2, @@ -1472,10 +1520,10 @@ 0. Also paths that are the same in two of three stages are collapsed into stage 0, taking the SHA1 from either stage 2 or stage 3, whichever is different from stage 1 (i.e. only one side -changed from the common ancestor).</p> -<p>After <em>collapsing</em> operation, paths that are different in three +changed from the common ancestor).</p></div> +<div class="para"><p>After <em>collapsing</em> operation, paths that are different in three trees are left in non-zero stages. At this point, you can -inspect the index file with this command:</p> +inspect the index file with this command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git ls-files --stage @@ -1484,13 +1532,13 @@ 100644 06fa6a24256dc7e560efa5687fa84b51f0263c3a 2 hello 100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello</tt></pre> </div></div> -<p>In our example of only two files, we did not have unchanged +<div class="para"><p>In our example of only two files, we did not have unchanged files so only <em>example</em> resulted in collapsing, but in real-life large projects, only small number of files change in one commit, and this <em>collapsing</em> tends to trivially merge most of the paths fairly quickly, leaving only a handful the real changes in non-zero -stages.</p> -<p>To look at only non-zero stages, use <tt>--unmerged</tt> flag:</p> +stages.</p></div> +<div class="para"><p>To look at only non-zero stages, use <tt>--unmerged</tt> flag:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git ls-files --unmerged @@ -1498,10 +1546,10 @@ 100644 06fa6a24256dc7e560efa5687fa84b51f0263c3a 2 hello 100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello</tt></pre> </div></div> -<p>The next step of merging is to merge these three versions of the +<div class="para"><p>The next step of merging is to merge these three versions of the file, using 3-way merge. This is done by giving -<tt>git-merge-one-file</tt> command as one of the arguments to -<tt>git-merge-index</tt> command:</p> +<em>git-merge-one-file</em> command as one of the arguments to +<em>git-merge-index</em> command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git merge-index git-merge-one-file hello @@ -1510,15 +1558,15 @@ ERROR: Merge conflict in hello. fatal: merge program failed</tt></pre> </div></div> -<p><tt>git-merge-one-file</tt> script is called with parameters to +<div class="para"><p><em>git-merge-one-file</em> script is called with parameters to describe those three versions, and is responsible to leave the merge results in the working tree. It is a fairly straightforward shell script, and -eventually calls <tt>merge</tt> program from RCS suite to perform a -file-level 3-way merge. In this case, <tt>merge</tt> detects +eventually calls <em>merge</em> program from RCS suite to perform a +file-level 3-way merge. In this case, <em>merge</em> detects conflicts, and the merge result with conflict marks is left in the working tree.. This can be seen if you run <tt>ls-files ---stage</tt> again at this point:</p> +--stage</tt> again at this point:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git ls-files --stage @@ -1527,18 +1575,18 @@ 100644 06fa6a24256dc7e560efa5687fa84b51f0263c3a 2 hello 100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello</tt></pre> </div></div> -<p>This is the state of the index file and the working file after -<tt>git-merge</tt> returns control back to you, leaving the conflicting +<div class="para"><p>This is the state of the index file and the working file after +<em>git-merge</em> returns control back to you, leaving the conflicting merge for you to resolve. Notice that the path <tt>hello</tt> is still -unmerged, and what you see with <tt>git-diff</tt> at this point is -differences since stage 2 (i.e. your version).</p> +unmerged, and what you see with <em>git-diff</em> at this point is +differences since stage 2 (i.e. your version).</p></div> </div> -<h2>Publishing your work</h2> +<h2 id="_publishing_your_work">Publishing your work</h2> <div class="sectionbody"> -<p>So, we can use somebody else's work from a remote repository, but +<div class="para"><p>So, we can use somebody else's work from a remote repository, but how can <strong>you</strong> prepare a repository to let other people pull from -it?</p> -<p>You do your real work in your working tree that has your +it?</p></div> +<div class="para"><p>You do your real work in your working tree that has your primary repository hanging under it as its <tt>.git</tt> subdirectory. You <strong>could</strong> make that repository accessible remotely and ask people to pull from it, but in practice that is not the way @@ -1546,7 +1594,7 @@ repository, make it reachable by other people, and when the changes you made in your primary working tree are in good shape, update the public repository from it. This is often called -<em>pushing</em>.</p> +<em>pushing</em>.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -1556,46 +1604,46 @@ how git repositories at <tt>kernel.org</tt> are managed.</td> </tr></table> </div> -<p>Publishing the changes from your local (private) repository to +<div class="para"><p>Publishing the changes from your local (private) repository to your remote (public) repository requires a write privilege on the remote machine. You need to have an SSH account there to -run a single command, <tt>git-receive-pack</tt>.</p> -<p>First, you need to create an empty repository on the remote +run a single command, <em>git-receive-pack</em>.</p></div> +<div class="para"><p>First, you need to create an empty repository on the remote machine that will house your public repository. This empty repository will be populated and be kept up-to-date by pushing into it later. Obviously, this repository creation needs to be -done only once.</p> +done only once.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <div class="title">Note</div> </td> -<td class="content"><tt>git-push</tt> uses a pair of programs, -<tt>git-send-pack</tt> on your local machine, and <tt>git-receive-pack</tt> +<td class="content"><em>git-push</em> uses a pair of programs, +<em>git-send-pack</em> on your local machine, and <em>git-receive-pack</em> on the remote machine. The communication between the two over the network internally uses an SSH connection.</td> </tr></table> </div> -<p>Your private repository's git directory is usually <tt>.git</tt>, but +<div class="para"><p>Your private repository's git directory is usually <tt>.git</tt>, but your public repository is often named after the project name, i.e. <tt><project>.git</tt>. Let's create such a public repository for project <tt>my-git</tt>. After logging into the remote machine, create -an empty directory:</p> +an empty directory:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ mkdir my-git.git</tt></pre> </div></div> -<p>Then, make that directory into a git repository by running -<tt>git init</tt>, but this time, since its name is not the usual -<tt>.git</tt>, we do things slightly differently:</p> +<div class="para"><p>Then, make that directory into a git repository by running +<em>git-init</em>, but this time, since its name is not the usual +<tt>.git</tt>, we do things slightly differently:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ GIT_DIR=my-git.git git init</tt></pre> </div></div> -<p>Make sure this directory is available for others you want your +<div class="para"><p>Make sure this directory is available for others you want your changes to be pulled by via the transport of your choice. Also -you need to make sure that you have the <tt>git-receive-pack</tt> -program on the <tt>$PATH</tt>.</p> +you need to make sure that you have the <em>git-receive-pack</em> +program on the <tt>$PATH</tt>.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -1603,9 +1651,9 @@ </td> <td class="content">Many installations of sshd do not invoke your shell as the login shell when you directly run programs; what this means is that if -your login shell is <tt>bash</tt>, only <tt>.bashrc</tt> is read and not +your login shell is <em>bash</em>, only <tt>.bashrc</tt> is read and not <tt>.bash_profile</tt>. As a workaround, make sure <tt>.bashrc</tt> sets up -<tt>$PATH</tt> so that you can run <tt>git-receive-pack</tt> program.</td> +<tt>$PATH</tt> so that you can run <em>git-receive-pack</em> program.</td> </tr></table> </div> <div class="admonitionblock"> @@ -1619,41 +1667,41 @@ repository, <tt>git update-server-info</tt> is run.</td> </tr></table> </div> -<p>Your "public repository" is now ready to accept your changes. +<div class="para"><p>Your "public repository" is now ready to accept your changes. Come back to the machine you have your private repository. From -there, run this command:</p> +there, run this command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git push <public-host>:/path/to/my-git.git master</tt></pre> </div></div> -<p>This synchronizes your public repository to match the named +<div class="para"><p>This synchronizes your public repository to match the named branch head (i.e. <tt>master</tt> in this case) and objects reachable -from them in your current repository.</p> -<p>As a real example, this is how I update my public git +from them in your current repository.</p></div> +<div class="para"><p>As a real example, this is how I update my public git repository. Kernel.org mirror network takes care of the -propagation to other publicly visible machines:</p> +propagation to other publicly visible machines:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git push master.kernel.org:/pub/scm/git/git.git/</tt></pre> </div></div> </div> -<h2>Packing your repository</h2> +<h2 id="_packing_your_repository">Packing your repository</h2> <div class="sectionbody"> -<p>Earlier, we saw that one file under <tt>.git/objects/??/</tt> directory +<div class="para"><p>Earlier, we saw that one file under <tt>.git/objects/??/</tt> directory is stored for each git object you create. This representation is efficient to create atomically and safely, but not so convenient to transport over the network. Since git objects are immutable once they are created, there is a way to optimize the -storage by "packing them together". The command</p> +storage by "packing them together". The command</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git repack</tt></pre> </div></div> -<p>will do it for you. If you followed the tutorial examples, you +<div class="para"><p>will do it for you. If you followed the tutorial examples, you would have accumulated about 17 objects in <tt>.git/objects/??/</tt> -directories by now. <tt>git repack</tt> tells you how many objects it +directories by now. <em>git-repack</em> tells you how many objects it packed, and stores the packed file in <tt>.git/objects/pack</tt> -directory.</p> +directory.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -1668,20 +1716,20 @@ access.</td> </tr></table> </div> -<p>If you are paranoid, running <tt>git-verify-pack</tt> command would +<div class="para"><p>If you are paranoid, running <em>git-verify-pack</em> command would detect if you have a corrupt pack, but do not worry too much. -Our programs are always perfect ;-).</p> -<p>Once you have packed objects, you do not need to leave the -unpacked objects that are contained in the pack file anymore.</p> +Our programs are always perfect ;-).</p></div> +<div class="para"><p>Once you have packed objects, you do not need to leave the +unpacked objects that are contained in the pack file anymore.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git prune-packed</tt></pre> </div></div> -<p>would remove them for you.</p> -<p>You can try running <tt>find .git/objects -type f</tt> before and after +<div class="para"><p>would remove them for you.</p></div> +<div class="para"><p>You can try running <tt>find .git/objects -type f</tt> before and after you run <tt>git prune-packed</tt> if you are curious. Also <tt>git count-objects</tt> would tell you how many unpacked objects are in -your repository and how much space they are consuming.</p> +your repository and how much space they are consuming.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -1694,34 +1742,34 @@ never.</td> </tr></table> </div> -<p>If you run <tt>git repack</tt> again at this point, it will say +<div class="para"><p>If you run <tt>git repack</tt> again at this point, it will say "Nothing to pack". Once you continue your development and accumulate the changes, running <tt>git repack</tt> again will create a new pack, that contains objects created since you packed your repository the last time. We recommend that you pack your project soon after the initial import (unless you are starting your project from scratch), and then run <tt>git repack</tt> every once in a -while, depending on how active your project is.</p> -<p>When a repository is synchronized via <tt>git push</tt> and <tt>git pull</tt> +while, depending on how active your project is.</p></div> +<div class="para"><p>When a repository is synchronized via <tt>git push</tt> and <tt>git pull</tt> objects packed in the source repository are usually stored unpacked in the destination, unless rsync transport is used. While this allows you to use different packing strategies on both ends, it also means you may need to repack both -repositories every once in a while.</p> +repositories every once in a while.</p></div> </div> -<h2>Working with Others</h2> +<h2 id="_working_with_others">Working with Others</h2> <div class="sectionbody"> -<p>Although git is a truly distributed system, it is often +<div class="para"><p>Although git is a truly distributed system, it is often convenient to organize your project with an informal hierarchy of developers. Linux kernel development is run this way. There is a nice illustration (page 17, "Merges to Mainline") in -<a href="http://www.xenotime.net/linux/mentor/linux-mentoring-2006.pdf">Randy Dunlap's presentation</a>.</p> -<p>It should be stressed that this hierarchy is purely <strong>informal</strong>. +<a href="http://www.xenotime.net/linux/mentor/linux-mentoring-2006.pdf">Randy Dunlap's presentation</a>.</p></div> +<div class="para"><p>It should be stressed that this hierarchy is purely <strong>informal</strong>. There is nothing fundamental in git that enforces the "chain of patch flow" this hierarchy implies. You do not have to pull -from only one remote repository.</p> -<p>A recommended workflow for a "project lead" goes like this:</p> -<ol> +from only one remote repository.</p></div> +<div class="para"><p>A recommended workflow for a "project lead" goes like this:</p></div> +<div class="olist"><ol> <li> <p> Prepare your primary repository on your local machine. Your @@ -1732,14 +1780,14 @@ <p> Prepare a public repository accessible to others. </p> -<p>If other people are pulling from your repository over dumb +<div class="para"><p>If other people are pulling from your repository over dumb transport protocols (HTTP), you need to keep this repository <em>dumb transport friendly</em>. After <tt>git init</tt>, <tt>$GIT_DIR/hooks/post-update</tt> copied from the standard templates -would contain a call to <tt>git-update-server-info</tt> but the +would contain a call to <em>git-update-server-info</em> but the <tt>post-update</tt> hook itself is disabled by default — enable it -with <tt>chmod +x post-update</tt>. This makes sure <tt>git-update-server-info</tt> -keeps the necessary files up-to-date.</p> +with <tt>chmod +x post-update</tt>. This makes sure <em>git-update-server-info</em> +keeps the necessary files up-to-date.</p></div> </li> <li> <p> @@ -1749,9 +1797,9 @@ </li> <li> <p> -<tt>git-repack</tt> the public repository. This establishes a big +<em>git-repack</em> the public repository. This establishes a big pack that contains the initial set of objects as the - baseline, and possibly <tt>git-prune</tt> if the transport + baseline, and possibly <em>git-prune</em> if the transport used for pulling from your repository supports packed repositories. </p> @@ -1763,7 +1811,7 @@ e-mails, and merges resulting from pulling the "public" repositories of your "subsystem maintainers". </p> -<p>You can repack this private repository whenever you feel like.</p> +<div class="para"><p>You can repack this private repository whenever you feel like.</p></div> </li> <li> <p> @@ -1777,13 +1825,13 @@ Go back to step 5. and continue working. </p> </li> -</ol> -<p>A recommended work cycle for a "subsystem maintainer" who works -on that project and has an own "public repository" goes like this:</p> -<ol> +</ol></div> +<div class="para"><p>A recommended work cycle for a "subsystem maintainer" who works +on that project and has an own "public repository" goes like this:</p></div> +<div class="olist"><ol> <li> <p> -Prepare your work repository, by <tt>git-clone</tt> the public +Prepare your work repository, by <em>git-clone</em> the public repository of the "project lead". The URL used for the initial cloning is stored in the remote.origin.url configuration variable. @@ -1807,7 +1855,7 @@ <li> <p> Push into the public repository from your primary - repository. Run <tt>git-repack</tt>, and possibly <tt>git-prune</tt> if the + repository. Run <em>git-repack</em>, and possibly <em>git-prune</em> if the transport used for pulling from your repository supports packed repositories. </p> @@ -1820,8 +1868,8 @@ repositories of your "project lead" and possibly your "sub-subsystem maintainers". </p> -<p>You can repack this private repository whenever you feel -like.</p> +<div class="para"><p>You can repack this private repository whenever you feel +like.</p></div> </li> <li> <p> @@ -1832,18 +1880,18 @@ </li> <li> <p> -Every once in a while, <tt>git-repack</tt> the public repository. +Every once in a while, <em>git-repack</em> the public repository. Go back to step 5. and continue working. </p> </li> -</ol> -<p>A recommended work cycle for an "individual developer" who does +</ol></div> +<div class="para"><p>A recommended work cycle for an "individual developer" who does not have a "public" repository is somewhat different. It goes -like this:</p> -<ol> +like this:</p></div> +<div class="olist"><ol> <li> <p> -Prepare your work repository, by <tt>git-clone</tt> the public +Prepare your work repository, by <em>git-clone</em> the public repository of the "project lead" (or a "subsystem maintainer", if you work on a subsystem). The URL used for the initial cloning is stored in the remote.origin.url @@ -1877,27 +1925,27 @@ step 2. and continue. </p> </li> -</ol> +</ol></div> </div> -<h2>Working with Others, Shared Repository Style</h2> +<h2 id="_working_with_others_shared_repository_style">Working with Others, Shared Repository Style</h2> <div class="sectionbody"> -<p>If you are coming from CVS background, the style of cooperation +<div class="para"><p>If you are coming from CVS background, the style of cooperation suggested in the previous section may be new to you. You do not have to worry. git supports "shared public repository" style of -cooperation you are probably more familiar with as well.</p> -<p>See <a href="gitcvs-migration.html">gitcvs-migration(7)</a> for the details.</p> +cooperation you are probably more familiar with as well.</p></div> +<div class="para"><p>See <a href="gitcvs-migration.html">gitcvs-migration(7)</a> for the details.</p></div> </div> -<h2>Bundling your work together</h2> +<h2 id="_bundling_your_work_together">Bundling your work together</h2> <div class="sectionbody"> -<p>It is likely that you will be working on more than one thing at +<div class="para"><p>It is likely that you will be working on more than one thing at a time. It is easy to manage those more-or-less independent tasks -using branches with git.</p> -<p>We have already seen how branches work previously, +using branches with git.</p></div> +<div class="para"><p>We have already seen how branches work previously, with "fun and work" example using two branches. The idea is the same if there are more than two branches. Let's say you started out from "master" head, and have some new code in the "master" branch, and two independent fixes in the "commit-fix" and -"diff-fix" branches:</p> +"diff-fix" branches:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show-branch @@ -1911,15 +1959,15 @@ * [master] Release candidate #1 ++* [diff-fix~2] Pretty-print messages.</tt></pre> </div></div> -<p>Both fixes are tested well, and at this point, you want to merge +<div class="para"><p>Both fixes are tested well, and at this point, you want to merge in both of them. You could merge in <em>diff-fix</em> first and then -<em>commit-fix</em> next, like this:</p> +<em>commit-fix</em> next, like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git merge -m "Merge fix in diff-fix" diff-fix $ git merge -m "Merge fix in commit-fix" commit-fix</tt></pre> </div></div> -<p>Which would result in:</p> +<div class="para"><p>Which would result in:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show-branch @@ -1935,21 +1983,21 @@ * [master~2] Release candidate #1 ++* [master~3] Pretty-print messages.</tt></pre> </div></div> -<p>However, there is no particular reason to merge in one branch +<div class="para"><p>However, there is no particular reason to merge in one branch first and the other next, when what you have are a set of truly independent changes (if the order mattered, then they are not independent by definition). You could instead merge those two branches into the current branch at once. First let's undo what we just did and start over. We would want to get the master -branch before these two merges by resetting it to <em>master~2</em>:</p> +branch before these two merges by resetting it to <em>master~2</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git reset --hard master~2</tt></pre> </div></div> -<p>You can make sure <em>git show-branch</em> matches the state before -those two <em>git merge</em> you just did. Then, instead of running -two <em>git merge</em> commands in a row, you would merge these two -branch heads (this is known as <em>making an Octopus</em>):</p> +<div class="para"><p>You can make sure <tt>git show-branch</tt> matches the state before +those two <em>git-merge</em> you just did. Then, instead of running +two <em>git-merge</em> commands in a row, you would merge these two +branch heads (this is known as <em>making an Octopus</em>):</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git merge commit-fix diff-fix @@ -1965,7 +2013,7 @@ * [master~1] Release candidate #1 ++* [master~2] Pretty-print messages.</tt></pre> </div></div> -<p>Note that you should not do Octopus because you can. An octopus +<div class="para"><p>Note that you should not do Octopus because you can. An octopus is a valid thing to do and often makes it easier to view the commit history if you are merging more than two independent changes at the same time. However, if you have merge conflicts @@ -1975,21 +2023,21 @@ merge two at a time, documenting how you resolved the conflicts, and the reason why you preferred changes made in one side over the other. Otherwise it would make the project history harder -to follow, not easier.</p> +to follow, not easier.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gittutorial-2.html">gittutorial-2(7)</a>, +<div class="para"><p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gittutorial-2.html">gittutorial-2(7)</a>, <a href="giteveryday.html">giteveryday(7)</a>, <a href="gitcvs-migration.html">gitcvs-migration(7)</a>, -<a href="user-manual.html">The Git User's Manual</a></p> +<a href="user-manual.html">The Git User's Manual</a></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite.</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:12 UTC +Last updated 2008-07-06 05:17:12 UTC </div> </div> </body> diff --git a/gitcore-tutorial.txt b/gitcore-tutorial.txt index 7d721c5..a2b9293 100644 --- a/gitcore-tutorial.txt +++ b/gitcore-tutorial.txt
@@ -42,9 +42,9 @@ to import into git. For our first example, we're going to start a totally new repository from -scratch, with no pre-existing files, and we'll call it `git-tutorial`. +scratch, with no pre-existing files, and we'll call it 'git-tutorial'. To start up, create a subdirectory for it, change into that -subdirectory, and initialize the git infrastructure with `git-init`: +subdirectory, and initialize the git infrastructure with 'git-init': ------------------------------------------------ $ mkdir git-tutorial @@ -61,7 +61,7 @@ which is just git's way of saying that you haven't been doing anything strange, and that it will have created a local `.git` directory setup for your new project. You will now have a `.git` directory, and you can -inspect that with `ls`. For your new empty project, it should show you +inspect that with 'ls'. For your new empty project, it should show you three entries, among other things: - a file called `HEAD`, that has `ref: refs/heads/master` in it. @@ -139,7 +139,7 @@ - commit that index file as an object. The first step is trivial: when you want to tell git about any changes -to your working tree, you use the `git-update-index` program. That +to your working tree, you use the 'git-update-index' program. That program normally just takes a list of filenames you want to update, but to avoid trivial mistakes, it refuses to add new entries to the index (or remove existing ones) unless you explicitly tell it that you're @@ -173,14 +173,14 @@ which correspond with the objects with names of `557db...` and `f24c7...` respectively. -If you want to, you can use `git-cat-file` to look at those objects, but +If you want to, you can use 'git-cat-file' to look at those objects, but you'll have to use the object name, not the filename of the object: ---------------- $ git cat-file -t 557db03de997c86a4a028e1ebd3a1ceb225be238 ---------------- -where the `-t` tells `git-cat-file` to tell you what the "type" of the +where the `-t` tells 'git-cat-file' to tell you what the "type" of the object is. git will tell you that you have a "blob" object (i.e., just a regular file), and you can see the contents with @@ -205,7 +205,7 @@ Anyway, as we mentioned previously, you normally never actually take a look at the objects themselves, and typing long 40-character hex names is not something you'd normally want to do. The above digression -was just to show that `git-update-index` did something magical, and +was just to show that 'git-update-index' did something magical, and actually saved away the contents of your files into the git object database. @@ -228,18 +228,18 @@ and you can now, since you told git about the previous state of `hello`, ask git what has changed in the tree compared to your old index, using the -`git-diff-files` command: +'git-diff-files' command: ------------ $ git diff-files ------------ Oops. That wasn't very readable. It just spit out its own internal -version of a `diff`, but that internal version really just tells you +version of a 'diff', but that internal version really just tells you that it has noticed that "hello" has been modified, and that the old object contents it had have been replaced with something else. -To make it readable, we can tell `git-diff-files` to output the +To make it readable, we can tell 'git-diff-files' to output the differences as a patch, using the `-p` flag: ------------ @@ -255,7 +255,7 @@ i.e. the diff of the change we caused by adding another line to `hello`. -In other words, `git-diff-files` always shows us the difference between +In other words, 'git-diff-files' always shows us the difference between what is recorded in the index, and what is currently in the working tree. That's very useful. @@ -283,7 +283,7 @@ object as a 'commit' object together with an explanation of what the tree was all about, along with information of how we came to that state. -Creating a tree object is trivial, and is done with `git-write-tree`. +Creating a tree object is trivial, and is done with 'git-write-tree'. There are no options or other input: `git write-tree` will take the current index state, and write an object that describes that whole index. In other words, we're now tying together all the different @@ -307,23 +307,23 @@ `git cat-file` to actually output the raw object contents, but you'll see mainly a binary mess, so that's less interesting). -However -- normally you'd never use `git-write-tree` on its own, because +However -- normally you'd never use 'git-write-tree' on its own, because normally you always commit a tree into a commit object using the -`git-commit-tree` command. In fact, it's easier to not actually use -`git-write-tree` on its own at all, but to just pass its result in as an -argument to `git-commit-tree`. +'git-commit-tree' command. In fact, it's easier to not actually use +'git-write-tree' on its own at all, but to just pass its result in as an +argument to 'git-commit-tree'. -`git-commit-tree` normally takes several arguments -- it wants to know +'git-commit-tree' normally takes several arguments -- it wants to know what the 'parent' of a commit was, but since this is the first commit ever in this new repository, and it has no parents, we only need to pass in -the object name of the tree. However, `git-commit-tree` also wants to get a +the object name of the tree. However, 'git-commit-tree' also wants to get a commit message on its standard input, and it will write out the resulting object name for the commit to its standard output. And this is where we create the `.git/refs/heads/master` file which is pointed at by `HEAD`. This file is supposed to contain the reference to the top-of-tree of the master branch, and since -that's exactly what `git-commit-tree` spits out, we can do this +that's exactly what 'git-commit-tree' spits out, we can do this all with a sequence of simple shell commands: ------------------------------------------------ @@ -345,11 +345,11 @@ Making a change --------------- -Remember how we did the `git-update-index` on file `hello` and then we +Remember how we did the 'git-update-index' on file `hello` and then we changed `hello` afterward, and could compare the new state of `hello` with the state we saved in the index file? -Further, remember how I said that `git-write-tree` writes the contents +Further, remember how I said that 'git-write-tree' writes the contents of the *index* file to the tree, and thus what we just committed was in fact the *original* contents of the file `hello`, not the new ones. We did that on purpose, to show the difference between the index state, and the @@ -360,12 +360,12 @@ we'll still see the same difference we saw last time: the index file hasn't changed by the act of committing anything. However, now that we have committed something, we can also learn to use a new command: -`git-diff-index`. +'git-diff-index'. -Unlike `git-diff-files`, which showed the difference between the index -file and the working tree, `git-diff-index` shows the differences +Unlike 'git-diff-files', which showed the difference between the index +file and the working tree, 'git-diff-index' shows the differences between a committed *tree* and either the index file or the working -tree. In other words, `git-diff-index` wants a tree to be diffed +tree. In other words, 'git-diff-index' wants a tree to be diffed against, and before we did the commit, we couldn't do that, because we didn't have anything to diff against. @@ -375,7 +375,7 @@ $ git diff-index -p HEAD ---------------- -(where `-p` has the same meaning as it did in `git-diff-files`), and it +(where `-p` has the same meaning as it did in 'git-diff-files'), and it will show us the same difference, but for a totally different reason. Now we're comparing the working tree not against the index file, but against the tree we just wrote. It just so happens that those two @@ -390,7 +390,7 @@ which ends up doing the above for you. -In other words, `git-diff-index` normally compares a tree against the +In other words, 'git-diff-index' normally compares a tree against the working tree, but when given the `\--cached` flag, it is told to instead compare against just the index cache contents, and ignore the current working tree state entirely. Since we just wrote the index @@ -399,7 +399,7 @@ [NOTE] ================ -`git-diff-index` really always uses the index for its +'git-diff-index' really always uses the index for its comparisons, and saying that it compares a tree against the working tree is thus not strictly accurate. In particular, the list of files to compare (the "meta-data") *always* comes from the index file, @@ -428,11 +428,11 @@ (note how we didn't need the `\--add` flag this time, since git knew about the file already). -Note what happens to the different `git-diff-\*` versions here. After +Note what happens to the different 'git-diff-\*' versions here. After we've updated `hello` in the index, `git diff-files -p` now shows no differences, but `git diff-index -p HEAD` still *does* show that the current state is different from the state we committed. In fact, now -`git-diff-index` shows the same difference whether we use the `--cached` +'git-diff-index' shows the same difference whether we use the `--cached` flag or not, since now the index is coherent with the working tree. Now, since we've updated `hello` in the index, we can commit the new @@ -460,7 +460,7 @@ looking at what `git commit` really does, feel free to investigate: it's a few very simple shell scripts to generate the helpful (?) commit message headers, and a few one-liners that actually do the -commit itself (`git-commit`). +commit itself ('git-commit'). Inspecting Changes @@ -468,9 +468,9 @@ While creating changes is useful, it's even more useful if you can tell later what changed. The most useful command for this is another of the -`diff` family, namely `git-diff-tree`. +'diff' family, namely 'git-diff-tree'. -`git-diff-tree` can be given two arbitrary trees, and it will tell you the +'git-diff-tree' can be given two arbitrary trees, and it will tell you the differences between them. Perhaps even more commonly, though, you can give it just a single commit object, and it will figure out the parent of that commit itself, and show the difference directly. Thus, to get @@ -518,15 +518,15 @@ +-----------+ ============ -More interestingly, you can also give `git-diff-tree` the `--pretty` flag, +More interestingly, you can also give 'git-diff-tree' the `--pretty` flag, which tells it to also show the commit message and author and date of the commit, and you can tell it to show a whole series of diffs. Alternatively, you can tell it to be "silent", and not show the diffs at all, but just show the actual commit message. -In fact, together with the `git-rev-list` program (which generates a -list of revisions), `git-diff-tree` ends up being a veritable fount of -changes. A trivial (but very useful) script called `git-whatchanged` is +In fact, together with the 'git-rev-list' program (which generates a +list of revisions), 'git-diff-tree' ends up being a veritable fount of +changes. A trivial (but very useful) script called 'git-whatchanged' is included with git which does exactly this, and shows a log of recent activities. @@ -553,14 +553,14 @@ If this is a problem because it is huge, you can hide it by setting the log.showroot configuration variable to false. Having this, you can still show it for each command just adding the `\--root` option, -which is a flag for `git-diff-tree` accepted by both commands. +which is a flag for 'git-diff-tree' accepted by both commands. With that, you should now be having some inkling of what git does, and can explore on your own. [NOTE] Most likely, you are not directly using the core -git Plumbing commands, but using Porcelain such as `git-add`, `git-rm' +git Plumbing commands, but using Porcelain such as 'git-add', `git-rm' and `git-commit'. @@ -595,7 +595,7 @@ message, along with optionally a PGP signature that says that yes, you really did that tag. You create these annotated tags with either the `-a` or -`-s` flag to `git tag`: +`-s` flag to 'git-tag': ---------------- $ git tag -s <tagname> @@ -642,7 +642,7 @@ history outside the project you created. - if you want to move or duplicate a git repository, you can do so. There - is `git clone` command, but if all you want to do is just to + is 'git-clone' command, but if all you want to do is just to create a copy of your repository (with all the full history that went along with it), you can do so with a regular `cp -a git-tutorial new-git-tutorial`. @@ -660,13 +660,13 @@ Note that the second point is true even across machines. You can duplicate a remote git repository with *any* regular copy mechanism, be it -`scp`, `rsync` or `wget`. +'scp', 'rsync' or 'wget'. When copying a remote repository, you'll want to at a minimum update the index cache when you do this, and especially with other peoples' repositories you often want to make sure that the index cache is in some known state (you don't know *what* they've done and not yet checked in), -so usually you'll precede the `git-update-index` with a +so usually you'll precede the 'git-update-index' with a ---------------- $ git read-tree --reset HEAD @@ -674,7 +674,7 @@ ---------------- which will force a total index re-build from the tree pointed to by `HEAD`. -It resets the index contents to `HEAD`, and then the `git-update-index` +It resets the index contents to `HEAD`, and then the 'git-update-index' makes sure to match up all index entries with the checked-out files. If the original repository had uncommitted changes in its working tree, `git update-index --refresh` notices them and @@ -689,8 +689,8 @@ and in fact a lot of the common git command combinations can be scripted with the `git xyz` interfaces. You can learn things by just looking at what the various git scripts do. For example, `git reset` used to be -the above two lines implemented in `git-reset`, but some things like -`git-status` and `git-commit` are slightly more complex scripts around +the above two lines implemented in 'git-reset', but some things like +'git-status' and 'git-commit' are slightly more complex scripts around the basic git commands. Many (most?) public remote repositories will not contain any of @@ -729,7 +729,7 @@ up-to-date (so that you don't have to refresh it afterward), and the `-a` flag means "check out all files" (if you have a stale copy or an older version of a checked out tree you may also need to add the `-f` -flag first, to tell `git-checkout-index` to *force* overwriting of any old +flag first, to tell 'git-checkout-index' to *force* overwriting of any old files). Again, this can all be simplified with @@ -776,7 +776,7 @@ ================================================ If you make the decision to start your new branch at some other point in the history than the current `HEAD`, you can do so by -just telling `git checkout` what the base of the checkout would be. +just telling 'git-checkout' what the base of the checkout would be. In other words, if you have an earlier tag or branch, you'd just do ------------ @@ -819,7 +819,7 @@ which will simply _create_ the branch, but will not do anything further. You can then later -- once you decide that you want to actually develop -on that branch -- switch to that branch with a regular `git checkout` +on that branch -- switch to that branch with a regular 'git-checkout' with the branchname as the argument. @@ -878,10 +878,10 @@ histories. You can also see exactly how they came to be from a common source. -Anyway, let's exit `gitk` (`^Q` or the File menu), and decide that we want +Anyway, let's exit 'gitk' (`^Q` or the File menu), and decide that we want to merge the work we did on the `mybranch` branch into the `master` branch (which is currently our `HEAD` too). To do that, there's a nice -script called `git merge`, which wants to know which branches you want +script called 'git-merge', which wants to know which branches you want to resolve and what the merge is all about: ------------ @@ -925,7 +925,7 @@ which will very loudly warn you that you're now committing a merge (which is correct, so never mind), and you can write a small merge -message about your adventures in `git-merge`-land. +message about your adventures in 'git-merge'-land. After you're done, start up `gitk \--all` to see graphically what the history looks like. Notice that `mybranch` still exists, and you can @@ -967,21 +967,21 @@ see more complex cases. [NOTE] -Without the '--more=1' option, `git-show-branch` would not output the +Without the '--more=1' option, 'git-show-branch' would not output the '[master^]' commit, as '[mybranch]' commit is a common ancestor of both 'master' and 'mybranch' tips. Please see linkgit:git-show-branch[1] for details. [NOTE] If there were more commits on the 'master' branch after the merge, the -merge commit itself would not be shown by `git-show-branch` by +merge commit itself would not be shown by 'git-show-branch' by default. You would need to provide '--sparse' option to make the merge commit visible in this case. Now, let's pretend you are the one who did all the work in `mybranch`, and the fruit of your hard work has finally been merged to the `master` branch. Let's go back to `mybranch`, and run -`git-merge` to get the "upstream changes" back to your branch. +'git-merge' to get the "upstream changes" back to your branch. ------------ $ git checkout mybranch @@ -1006,7 +1006,7 @@ often called 'fast forward' merge. You can run `gitk \--all` again to see how the commit ancestry -looks like, or run `show-branch`, which tells you this. +looks like, or run 'show-branch', which tells you this. ------------------------------------------------ $ git show-branch master mybranch @@ -1023,12 +1023,12 @@ It's usually much more common that you merge with somebody else than merging with your own branches, so it's worth pointing out that git makes that very easy too, and in fact, it's not that different from -doing a `git merge`. In fact, a remote merge ends up being nothing +doing a 'git-merge'. In fact, a remote merge ends up being nothing more than "fetch the work from a remote repository into a temporary tag" -followed by a `git merge`. +followed by a 'git-merge'. Fetching from a remote repository is done by, unsurprisingly, -`git fetch`: +'git-fetch': ---------------- $ git fetch <remote-repository> @@ -1066,9 +1066,9 @@ Local directory:: `/path/to/repo.git/` + -This transport is the same as SSH transport but uses `sh` to run +This transport is the same as SSH transport but uses 'sh' to run both ends on the local machine instead of running other end on -the remote machine via `ssh`. +the remote machine via 'ssh'. git Native:: `git://remote.machine/path/to/repo.git/` @@ -1095,7 +1095,7 @@ transports', because they do not require any git aware smart server like git Native transport does. Any stock HTTP server that does not even support directory index would suffice. But -you must prepare your repository with `git-update-server-info` +you must prepare your repository with 'git-update-server-info' to help dumb transport downloaders. Once you fetch from the remote repository, you `merge` that @@ -1115,7 +1115,7 @@ [NOTE] You could do without using any branches at all, by keeping as many local repositories as you would like to have -branches, and merging between them with `git pull`, just like +branches, and merging between them with 'git-pull', just like you merge between branches. The advantage of this approach is that it lets you keep a set of files for each `branch` checked out and you may find it easier to switch back and forth if you @@ -1132,7 +1132,7 @@ $ git config remote.linus.url http://www.kernel.org/pub/scm/git/git.git/ ------------------------------------------------ -and use the "linus" keyword with `git pull` instead of the full URL. +and use the "linus" keyword with 'git-pull' instead of the full URL. Examples. @@ -1168,7 +1168,7 @@ +* [master^] Some fun. ------------ -Remember, before running `git merge`, our `master` head was at +Remember, before running 'git-merge', our `master` head was at "Some fun." commit, while our `mybranch` head was at "Some work." commit. @@ -1195,7 +1195,7 @@ `git merge` command, when merging two branches, uses 3-way merge algorithm. First, it finds the common ancestor between them. -The command it uses is `git-merge-base`: +The command it uses is 'git-merge-base': ------------ $ mb=$(git merge-base HEAD mybranch) @@ -1219,7 +1219,7 @@ $ git read-tree -m -u $mb HEAD mybranch ------------ -This is the same `git-read-tree` command we have already seen, +This is the same 'git-read-tree' command we have already seen, but it takes three trees, unlike previous examples. This reads the contents of each tree into different 'stage' in the index file (the first tree goes to stage 1, the second to stage 2, @@ -1260,8 +1260,8 @@ The next step of merging is to merge these three versions of the file, using 3-way merge. This is done by giving -`git-merge-one-file` command as one of the arguments to -`git-merge-index` command: +'git-merge-one-file' command as one of the arguments to +'git-merge-index' command: ------------ $ git merge-index git-merge-one-file hello @@ -1271,12 +1271,12 @@ fatal: merge program failed ------------ -`git-merge-one-file` script is called with parameters to +'git-merge-one-file' script is called with parameters to describe those three versions, and is responsible to leave the merge results in the working tree. It is a fairly straightforward shell script, and -eventually calls `merge` program from RCS suite to perform a -file-level 3-way merge. In this case, `merge` detects +eventually calls 'merge' program from RCS suite to perform a +file-level 3-way merge. In this case, 'merge' detects conflicts, and the merge result with conflict marks is left in the working tree.. This can be seen if you run `ls-files --stage` again at this point: @@ -1290,9 +1290,9 @@ ------------ This is the state of the index file and the working file after -`git-merge` returns control back to you, leaving the conflicting +'git-merge' returns control back to you, leaving the conflicting merge for you to resolve. Notice that the path `hello` is still -unmerged, and what you see with `git-diff` at this point is +unmerged, and what you see with 'git-diff' at this point is differences since stage 2 (i.e. your version). @@ -1320,7 +1320,7 @@ Publishing the changes from your local (private) repository to your remote (public) repository requires a write privilege on the remote machine. You need to have an SSH account there to -run a single command, `git-receive-pack`. +run a single command, 'git-receive-pack'. First, you need to create an empty repository on the remote machine that will house your public repository. This empty @@ -1329,8 +1329,8 @@ done only once. [NOTE] -`git-push` uses a pair of programs, -`git-send-pack` on your local machine, and `git-receive-pack` +'git-push' uses a pair of programs, +'git-send-pack' on your local machine, and 'git-receive-pack' on the remote machine. The communication between the two over the network internally uses an SSH connection. @@ -1345,7 +1345,7 @@ ------------ Then, make that directory into a git repository by running -`git init`, but this time, since its name is not the usual +'git-init', but this time, since its name is not the usual `.git`, we do things slightly differently: ------------ @@ -1354,15 +1354,15 @@ Make sure this directory is available for others you want your changes to be pulled by via the transport of your choice. Also -you need to make sure that you have the `git-receive-pack` +you need to make sure that you have the 'git-receive-pack' program on the `$PATH`. [NOTE] Many installations of sshd do not invoke your shell as the login shell when you directly run programs; what this means is that if -your login shell is `bash`, only `.bashrc` is read and not +your login shell is 'bash', only `.bashrc` is read and not `.bash_profile`. As a workaround, make sure `.bashrc` sets up -`$PATH` so that you can run `git-receive-pack` program. +`$PATH` so that you can run 'git-receive-pack' program. [NOTE] If you plan to publish this repository to be accessed over http, @@ -1407,7 +1407,7 @@ will do it for you. If you followed the tutorial examples, you would have accumulated about 17 objects in `.git/objects/??/` -directories by now. `git repack` tells you how many objects it +directories by now. 'git-repack' tells you how many objects it packed, and stores the packed file in `.git/objects/pack` directory. @@ -1420,7 +1420,7 @@ in the pack, and the latter holds the index for random access. -If you are paranoid, running `git-verify-pack` command would +If you are paranoid, running 'git-verify-pack' command would detect if you have a corrupt pack, but do not worry too much. Our programs are always perfect ;-). @@ -1487,17 +1487,17 @@ transport protocols (HTTP), you need to keep this repository 'dumb transport friendly'. After `git init`, `$GIT_DIR/hooks/post-update` copied from the standard templates -would contain a call to `git-update-server-info` but the +would contain a call to 'git-update-server-info' but the `post-update` hook itself is disabled by default -- enable it -with `chmod +x post-update`. This makes sure `git-update-server-info` +with `chmod +x post-update`. This makes sure 'git-update-server-info' keeps the necessary files up-to-date. 3. Push into the public repository from your primary repository. -4. `git-repack` the public repository. This establishes a big +4. 'git-repack' the public repository. This establishes a big pack that contains the initial set of objects as the - baseline, and possibly `git-prune` if the transport + baseline, and possibly 'git-prune' if the transport used for pulling from your repository supports packed repositories. @@ -1518,7 +1518,7 @@ A recommended work cycle for a "subsystem maintainer" who works on that project and has an own "public repository" goes like this: -1. Prepare your work repository, by `git-clone` the public +1. Prepare your work repository, by 'git-clone' the public repository of the "project lead". The URL used for the initial cloning is stored in the remote.origin.url configuration variable. @@ -1533,7 +1533,7 @@ point at the repository you are borrowing from. 4. Push into the public repository from your primary - repository. Run `git-repack`, and possibly `git-prune` if the + repository. Run 'git-repack', and possibly 'git-prune' if the transport used for pulling from your repository supports packed repositories. @@ -1550,7 +1550,7 @@ "project lead" and possibly your "sub-subsystem maintainers" to pull from it. -7. Every once in a while, `git-repack` the public repository. +7. Every once in a while, 'git-repack' the public repository. Go back to step 5. and continue working. @@ -1558,7 +1558,7 @@ not have a "public" repository is somewhat different. It goes like this: -1. Prepare your work repository, by `git-clone` the public +1. Prepare your work repository, by 'git-clone' the public repository of the "project lead" (or a "subsystem maintainer", if you work on a subsystem). The URL used for the initial cloning is stored in the remote.origin.url @@ -1655,9 +1655,9 @@ $ git reset --hard master~2 ------------ -You can make sure 'git show-branch' matches the state before -those two 'git merge' you just did. Then, instead of running -two 'git merge' commands in a row, you would merge these two +You can make sure `git show-branch` matches the state before +those two 'git-merge' you just did. Then, instead of running +two 'git-merge' commands in a row, you would merge these two branch heads (this is known as 'making an Octopus'): ------------ diff --git a/gitcvs-migration.html b/gitcvs-migration.html index 7c914eb..758fe93 100644 --- a/gitcvs-migration.html +++ b/gitcvs-migration.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>gitcvs-migration(7)</title> </head> @@ -272,81 +320,81 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p>git cvsimport *</p> +<div class="para"><p>git cvsimport *</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Git differs from CVS in that every working tree contains a repository with +<div class="para"><p>Git differs from CVS in that every working tree contains a repository with a full copy of the project history, and no repository is inherently more important than any other. However, you can emulate the CVS model by designating a single shared repository which people can synchronize with; -this document explains how to do that.</p> -<p>Some basic familiarity with git is required. Having gone through +this document explains how to do that.</p></div> +<div class="para"><p>Some basic familiarity with git is required. Having gone through <a href="gittutorial.html">gittutorial(7)</a> and -<a href="gitglossary.html">gitglossary(7)</a> should be sufficient.</p> +<a href="gitglossary.html">gitglossary(7)</a> should be sufficient.</p></div> </div> -<h2>Developing against a shared repository</h2> +<h2 id="_developing_against_a_shared_repository">Developing against a shared repository</h2> <div class="sectionbody"> -<p>Suppose a shared repository is set up in /pub/repo.git on the host +<div class="para"><p>Suppose a shared repository is set up in /pub/repo.git on the host foo.com. Then as an individual committer you can clone the shared -repository over ssh with:</p> +repository over ssh with:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git clone foo.com:/pub/repo.git/ my-project $ cd my-project</tt></pre> </div></div> -<p>and hack away. The equivalent of <tt>cvs update</tt> is</p> +<div class="para"><p>and hack away. The equivalent of <em>cvs update</em> is</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git pull origin</tt></pre> </div></div> -<p>which merges in any work that others might have done since the clone +<div class="para"><p>which merges in any work that others might have done since the clone operation. If there are uncommitted changes in your working tree, commit -them first before running git pull.</p> +them first before running git pull.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <div class="title">Note</div> </td> <td class="content"> -<p>The <tt>pull</tt> command knows where to get updates from because of certain -configuration variables that were set by the first <tt>git-clone</tt> +<div class="para"><p>The <em>pull</em> command knows where to get updates from because of certain +configuration variables that were set by the first <em>git-clone</em> command; see <tt>git config -l</tt> and the <a href="git-config.html">git-config(1)</a> man -page for details.</p> +page for details.</p></div> </td> </tr></table> </div> -<p>You can update the shared repository with your changes by first committing -your changes, and then using the <tt>git-push</tt> command:</p> +<div class="para"><p>You can update the shared repository with your changes by first committing +your changes, and then using the <em>git-push</em> command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git push origin master</tt></pre> </div></div> -<p>to "push" those commits to the shared repository. If someone else has -updated the repository more recently, <tt>git-push</tt>, like <tt>cvs commit</tt>, will +<div class="para"><p>to "push" those commits to the shared repository. If someone else has +updated the repository more recently, <em>git-push</em>, like <em>cvs commit</em>, will complain, in which case you must pull any changes before attempting the -push again.</p> -<p>In the <tt>git-push</tt> command above we specify the name of the remote branch -to update (<tt>master</tt>). If we leave that out, <tt>git-push</tt> tries to update +push again.</p></div> +<div class="para"><p>In the <em>git-push</em> command above we specify the name of the remote branch +to update (<tt>master</tt>). If we leave that out, <em>git-push</em> tries to update any branches in the remote repository that have the same name as a branch -in the local repository. So the last <tt>push</tt> can be done with either of:</p> +in the local repository. So the last <em>push</em> can be done with either of:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git push origin $ git push foo.com:/pub/project.git/</tt></pre> </div></div> -<p>as long as the shared repository does not have any branches -other than <tt>master</tt>.</p> +<div class="para"><p>as long as the shared repository does not have any branches +other than <tt>master</tt>.</p></div> </div> -<h2>Setting Up a Shared Repository</h2> +<h2 id="_setting_up_a_shared_repository">Setting Up a Shared Repository</h2> <div class="sectionbody"> -<p>We assume you have already created a git repository for your project, +<div class="para"><p>We assume you have already created a git repository for your project, possibly created from scratch or from a tarball (see <a href="gittutorial.html">gittutorial(7)</a>), or imported from an already existing CVS -repository (see the next section).</p> -<p>Assume your existing repo is at /home/alice/myproject. Create a new "bare" +repository (see the next section).</p></div> +<div class="para"><p>Assume your existing repo is at /home/alice/myproject. Create a new "bare" repository (a repository without a working tree) and fetch your project into -it:</p> +it:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ mkdir /pub/my-repo.git @@ -354,95 +402,99 @@ $ git --bare init --shared $ git --bare fetch /home/alice/myproject master:master</tt></pre> </div></div> -<p>Next, give every team member read/write access to this repository. One +<div class="para"><p>Next, give every team member read/write access to this repository. One easy way to do this is to give all the team members ssh access to the machine where the repository is hosted. If you don't want to give them a full shell on the machine, there is a restricted shell which only allows -users to do git pushes and pulls; see <a href="git-shell.html">git-shell(1)</a>.</p> -<p>Put all the committers in the same group, and make the repository -writable by that group:</p> +users to do git pushes and pulls; see <a href="git-shell.html">git-shell(1)</a>.</p></div> +<div class="para"><p>Put all the committers in the same group, and make the repository +writable by that group:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ chgrp -R $group /pub/my-repo.git</tt></pre> </div></div> -<p>Make sure committers have a umask of at most 027, so that the directories -they create are writable and searchable by other group members.</p> +<div class="para"><p>Make sure committers have a umask of at most 027, so that the directories +they create are writable and searchable by other group members.</p></div> </div> -<h2>Importing a CVS archive</h2> +<h2 id="_importing_a_cvs_archive">Importing a CVS archive</h2> <div class="sectionbody"> -<p>First, install version 2.1 or higher of cvsps from +<div class="para"><p>First, install version 2.1 or higher of cvsps from <a href="http://www.cobite.com/cvsps/">http://www.cobite.com/cvsps/</a> and make sure it is in your path. Then cd to a checked out CVS working directory -of the project you are interested in and run <tt>git-cvsimport</tt>:</p> +of the project you are interested in and run <em>git-cvsimport</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git cvsimport -C <destination> <module></tt></pre> </div></div> -<p>This puts a git archive of the named CVS module in the directory -<destination>, which will be created if necessary.</p> -<p>The import checks out from CVS every revision of every file. Reportedly +<div class="para"><p>This puts a git archive of the named CVS module in the directory +<destination>, which will be created if necessary.</p></div> +<div class="para"><p>The import checks out from CVS every revision of every file. Reportedly cvsimport can average some twenty revisions per second, so for a medium-sized project this should not take more than a couple of minutes. -Larger projects or remote repositories may take longer.</p> -<p>The main trunk is stored in the git branch named <tt>origin</tt>, and additional +Larger projects or remote repositories may take longer.</p></div> +<div class="para"><p>The main trunk is stored in the git branch named <tt>origin</tt>, and additional CVS branches are stored in git branches with the same names. The most recent version of the main trunk is also left checked out on the <tt>master</tt> -branch, so you can start adding your own changes right away.</p> -<p>The import is incremental, so if you call it again next month it will +branch, so you can start adding your own changes right away.</p></div> +<div class="para"><p>The import is incremental, so if you call it again next month it will fetch any CVS updates that have been made in the meantime. For this to work, you must not modify the imported branches; instead, create new branches for your own changes, and merge in the imported branches as -necessary.</p> +necessary.</p></div> +<div class="para"><p>If you want a shared repository, you will need to make a bare clone +of the imported directory, as described above. Then treat the imported +directory as another development clone for purposes of merging +incremental imports.</p></div> </div> -<h2>Advanced Shared Repository Management</h2> +<h2 id="_advanced_shared_repository_management">Advanced Shared Repository Management</h2> <div class="sectionbody"> -<p>Git allows you to specify scripts called "hooks" to be run at certain +<div class="para"><p>Git allows you to specify scripts called "hooks" to be run at certain points. You can use these, for example, to send all commits to the shared -repository to a mailing list. See <a href="githooks.html">githooks(5)</a>.</p> -<p>You can enforce finer grained permissions using update hooks. See +repository to a mailing list. See <a href="githooks.html">githooks(5)</a>.</p></div> +<div class="para"><p>You can enforce finer grained permissions using update hooks. See <a href="howto/update-hook-example.txt">Controlling access to branches using -update hooks</a>.</p> +update hooks</a>.</p></div> </div> -<h2>Providing CVS Access to a git Repository</h2> +<h2 id="_providing_cvs_access_to_a_git_repository">Providing CVS Access to a git Repository</h2> <div class="sectionbody"> -<p>It is also possible to provide true CVS access to a git repository, so +<div class="para"><p>It is also possible to provide true CVS access to a git repository, so that developers can still use CVS; see <a href="git-cvsserver.html">git-cvsserver(1)</a> for -details.</p> +details.</p></div> </div> -<h2>Alternative Development Models</h2> +<h2 id="_alternative_development_models">Alternative Development Models</h2> <div class="sectionbody"> -<p>CVS users are accustomed to giving a group of developers commit access to +<div class="para"><p>CVS users are accustomed to giving a group of developers commit access to a common repository. As we've seen, this is also possible with git. However, the distributed nature of git allows other development models, and you may want to first consider whether one of them might be a better -fit for your project.</p> -<p>For example, you can choose a single person to maintain the project's +fit for your project.</p></div> +<div class="para"><p>For example, you can choose a single person to maintain the project's primary public repository. Other developers then clone this repository and each work in their own clone. When they have a series of changes that they're happy with, they ask the maintainer to pull from the branch containing the changes. The maintainer reviews their changes and pulls them into the primary repository, which other developers pull from as necessary to stay coordinated. The Linux kernel and other projects use -variants of this model.</p> -<p>With a small group, developers may just pull changes from each other's -repositories without the need for a central maintainer.</p> +variants of this model.</p></div> +<div class="para"><p>With a small group, developers may just pull changes from each other's +repositories without the need for a central maintainer.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="gittutorial.html">gittutorial(7)</a>, +<div class="para"><p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gittutorial-2.html">gittutorial-2(7)</a>, <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>, <a href="gitglossary.html">gitglossary(7)</a>, <a href="everyday.html">Everyday Git</a>, -<a href="user-manual.html">The Git User's Manual</a></p> +<a href="user-manual.html">The Git User's Manual</a></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite.</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:12 UTC +Last updated 2008-07-06 05:17:12 UTC </div> </div> </body> diff --git a/gitcvs-migration.txt b/gitcvs-migration.txt index 4dc7ec5..aaa7ef7 100644 --- a/gitcvs-migration.txt +++ b/gitcvs-migration.txt
@@ -34,7 +34,7 @@ $ cd my-project ------------------------------------------------ -and hack away. The equivalent of `cvs update` is +and hack away. The equivalent of 'cvs update' is ------------------------------------------------ $ git pull origin @@ -46,28 +46,28 @@ [NOTE] ================================ -The `pull` command knows where to get updates from because of certain -configuration variables that were set by the first `git-clone` +The 'pull' command knows where to get updates from because of certain +configuration variables that were set by the first 'git-clone' command; see `git config -l` and the linkgit:git-config[1] man page for details. ================================ You can update the shared repository with your changes by first committing -your changes, and then using the `git-push` command: +your changes, and then using the 'git-push' command: ------------------------------------------------ $ git push origin master ------------------------------------------------ to "push" those commits to the shared repository. If someone else has -updated the repository more recently, `git-push`, like `cvs commit`, will +updated the repository more recently, 'git-push', like 'cvs commit', will complain, in which case you must pull any changes before attempting the push again. -In the `git-push` command above we specify the name of the remote branch -to update (`master`). If we leave that out, `git-push` tries to update +In the 'git-push' command above we specify the name of the remote branch +to update (`master`). If we leave that out, 'git-push' tries to update any branches in the remote repository that have the same name as a branch -in the local repository. So the last `push` can be done with either of: +in the local repository. So the last 'push' can be done with either of: ------------ $ git push origin @@ -118,7 +118,7 @@ First, install version 2.1 or higher of cvsps from link:http://www.cobite.com/cvsps/[http://www.cobite.com/cvsps/] and make sure it is in your path. Then cd to a checked out CVS working directory -of the project you are interested in and run `git-cvsimport`: +of the project you are interested in and run 'git-cvsimport': ------------------------------------------- $ git cvsimport -C <destination> <module> @@ -143,6 +143,11 @@ branches for your own changes, and merge in the imported branches as necessary. +If you want a shared repository, you will need to make a bare clone +of the imported directory, as described above. Then treat the imported +directory as another development clone for purposes of merging +incremental imports. + Advanced Shared Repository Management -------------------------------------
diff --git a/gitdiffcore.html b/gitdiffcore.html index 600ba7d..798f42a 100644 --- a/gitdiffcore.html +++ b/gitdiffcore.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>gitdiffcore(7)</title> </head> @@ -272,25 +320,25 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p>git diff *</p> +<div class="para"><p><em>git diff</em> *</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>The diff commands <tt>git-diff-index</tt>, <tt>git-diff-files</tt>, and <tt>git-diff-tree</tt> +<div class="para"><p>The diff commands <em>git-diff-index</em>, <em>git-diff-files</em>, and <em>git-diff-tree</em> can be told to manipulate differences they find in -unconventional ways before showing <tt>diff</tt> output. The manipulation +unconventional ways before showing <em>diff</em> output. The manipulation is collectively called "diffcore transformation". This short note -describes what they are and how to use them to produce diff outputs -that are easier to understand than the conventional kind.</p> +describes what they are and how to use them to produce <em>diff</em> output +that is easier to understand than the conventional kind.</p></div> </div> -<h2>The chain of operation</h2> +<h2 id="_the_chain_of_operation">The chain of operation</h2> <div class="sectionbody"> -<p>The <tt>git-diff-*</tt> family works by first comparing two sets of -files:</p> -<ul> +<div class="para"><p>The <em>git-diff-*</em> family works by first comparing two sets of +files:</p></div> +<div class="ilist"><ul> <li> <p> -<tt>git-diff-index</tt> compares contents of a "tree" object and the +<em>git-diff-index</em> compares contents of a "tree" object and the working directory (when <em>--cached</em> flag is not used) or a "tree" object and the index file (when <em>--cached</em> flag is used); @@ -298,21 +346,21 @@ </li> <li> <p> -<tt>git-diff-files</tt> compares contents of the index file and the +<em>git-diff-files</em> compares contents of the index file and the working directory; </p> </li> <li> <p> -<tt>git-diff-tree</tt> compares contents of two "tree" objects; +<em>git-diff-tree</em> compares contents of two "tree" objects; </p> </li> -</ul> -<p>In all of these cases, the commands themselves compare +</ul></div> +<div class="para"><p>In all of these cases, the commands themselves compare corresponding paths in the two sets of files. The result of comparison is passed from these commands to what is internally called "diffcore", in a format similar to what is output when -the -p option is not used. E.g.</p> +the -p option is not used. E.g.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0 @@ -320,11 +368,11 @@ delete :100644 000000 1234567... 0000000... D file5 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre> </div></div> -<p>The diffcore mechanism is fed a list of such comparison results +<div class="para"><p>The diffcore mechanism is fed a list of such comparison results (each of which is called "filepair", although at this point each of them talks about a single file), and transforms such a list -into another list. There are currently 6 such transformations:</p> -<ul> +into another list. There are currently 6 such transformations:</p></div> +<div class="ilist"><ul> <li> <p> diffcore-pathspec @@ -355,54 +403,54 @@ diffcore-order </p> </li> -</ul> -<p>These are applied in sequence. The set of filepairs <tt>git-diff-*</tt> +</ul></div> +<div class="para"><p>These are applied in sequence. The set of filepairs <em>git-diff-*</em> commands find are used as the input to diffcore-pathspec, and the output from diffcore-pathspec is used as the input to the next transformation. The final result is then passed to the output routine and generates either diff-raw format (see Output -format sections of the manual for <tt>git-diff-*</tt> commands) or -diff-patch format.</p> +format sections of the manual for <em>git-diff-*</em> commands) or +diff-patch format.</p></div> </div> -<h2>diffcore-pathspec: For Ignoring Files Outside Our Consideration</h2> +<h2 id="_diffcore_pathspec_for_ignoring_files_outside_our_consideration">diffcore-pathspec: For Ignoring Files Outside Our Consideration</h2> <div class="sectionbody"> -<p>The first transformation in the chain is diffcore-pathspec, and +<div class="para"><p>The first transformation in the chain is diffcore-pathspec, and is controlled by giving the pathname parameters to the -<tt>git-diff-*</tt> commands on the command line. The pathspec is used +<em>git-diff-*</em> commands on the command line. The pathspec is used to limit the world diff operates in. It removes the filepairs outside the specified set of pathnames. E.g. If the input set -of filepairs included:</p> +of filepairs included:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 100644 bcd1234... 0123456... M junkfile</tt></pre> </div></div> -<p>but the command invocation was <tt>git diff-files myfile</tt>, then the +<div class="para"><p>but the command invocation was <tt>git diff-files myfile</tt>, then the junkfile entry would be removed from the list because only "myfile" -is under consideration.</p> -<p>Implementation note. For performance reasons, <tt>git-diff-tree</tt> +is under consideration.</p></div> +<div class="para"><p>Implementation note. For performance reasons, <em>git-diff-tree</em> uses the pathname parameters on the command line to cull set of filepairs it feeds the diffcore mechanism itself, and does not -use diffcore-pathspec, but the end result is the same.</p> +use diffcore-pathspec, but the end result is the same.</p></div> </div> -<h2>diffcore-break: For Splitting Up "Complete Rewrites"</h2> +<h2 id="_diffcore_break_for_splitting_up_complete_rewrites">diffcore-break: For Splitting Up "Complete Rewrites"</h2> <div class="sectionbody"> -<p>The second transformation in the chain is diffcore-break, and is -controlled by the -B option to the <tt>git-diff-*</tt> commands. This is +<div class="para"><p>The second transformation in the chain is diffcore-break, and is +controlled by the -B option to the <em>git-diff-*</em> commands. This is used to detect a filepair that represents "complete rewrite" and break such filepair into two filepairs that represent delete and -create. E.g. If the input contained this filepair:</p> +create. E.g. If the input contained this filepair:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 100644 bcd1234... 0123456... M file0</tt></pre> </div></div> -<p>and if it detects that the file "file0" is completely rewritten, -it changes it to:</p> +<div class="para"><p>and if it detects that the file "file0" is completely rewritten, +it changes it to:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 000000 bcd1234... 0000000... D file0 :000000 100644 0000000... 0123456... A file0</tt></pre> </div></div> -<p>For the purpose of breaking a filepair, diffcore-break examines +<div class="para"><p>For the purpose of breaking a filepair, diffcore-break examines the extent of changes between the contents of the files before and after modification (i.e. the contents that have "bcd1234…" and "0123456…" as their SHA1 content ID, in the above @@ -413,66 +461,66 @@ and the result (i.e. if the edit shrinks the file, the size of the result is used; if the edit lengthens the file, the size of the original is used), and can be customized by giving a number -after "-B" option (e.g. "-B75" to tell it to use 75%).</p> +after "-B" option (e.g. "-B75" to tell it to use 75%).</p></div> </div> -<h2>diffcore-rename: For Detection Renames and Copies</h2> +<h2 id="_diffcore_rename_for_detection_renames_and_copies">diffcore-rename: For Detection Renames and Copies</h2> <div class="sectionbody"> -<p>This transformation is used to detect renames and copies, and is +<div class="para"><p>This transformation is used to detect renames and copies, and is controlled by the -M option (to detect renames) and the -C option -(to detect copies as well) to the <tt>git-diff-*</tt> commands. If the -input contained these filepairs:</p> +(to detect copies as well) to the <em>git-diff-*</em> commands. If the +input contained these filepairs:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 000000 0123456... 0000000... D fileX :000000 100644 0000000... 0123456... A file0</tt></pre> </div></div> -<p>and the contents of the deleted file fileX is similar enough to +<div class="para"><p>and the contents of the deleted file fileX is similar enough to the contents of the created file file0, then rename detection -merges these filepairs and creates:</p> +merges these filepairs and creates:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 100644 0123456... 0123456... R100 fileX file0</tt></pre> </div></div> -<p>When the "-C" option is used, the original contents of modified files, +<div class="para"><p>When the "-C" option is used, the original contents of modified files, and deleted files (and also unmodified files, if the "--find-copies-harder" option is used) are considered as candidates of the source files in rename/copy operation. If the input were like these filepairs, that talk about a modified file fileY and a newly -created file file0:</p> +created file file0:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 100644 0123456... 1234567... M fileY :000000 100644 0000000... bcd3456... A file0</tt></pre> </div></div> -<p>the original contents of fileY and the resulting contents of +<div class="para"><p>the original contents of fileY and the resulting contents of file0 are compared, and if they are similar enough, they are -changed to:</p> +changed to:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 100644 0123456... 1234567... M fileY :100644 100644 0123456... bcd3456... C100 fileY file0</tt></pre> </div></div> -<p>In both rename and copy detection, the same "extent of changes" +<div class="para"><p>In both rename and copy detection, the same "extent of changes" algorithm used in diffcore-break is used to determine if two files are "similar enough", and can be customized to use a similarity score different from the default of 50% by giving a number after the "-M" or "-C" option (e.g. "-M8" to tell it to use -8/10 = 80%).</p> -<p>Note. When the "-C" option is used with <tt>--find-copies-harder</tt> -option, <tt>git-diff-*</tt> commands feed unmodified filepairs to +8/10 = 80%).</p></div> +<div class="para"><p>Note. When the "-C" option is used with <tt>--find-copies-harder</tt> +option, <em>git-diff-*</em> commands feed unmodified filepairs to diffcore mechanism as well as modified ones. This lets the copy detector consider unmodified files as copy source candidates at the expense of making it slower. Without <tt>--find-copies-harder</tt>, -<tt>git-diff-*</tt> commands can detect copies only if the file that was -copied happened to have been modified in the same changeset.</p> +<em>git-diff-*</em> commands can detect copies only if the file that was +copied happened to have been modified in the same changeset.</p></div> </div> -<h2>diffcore-merge-broken: For Putting "Complete Rewrites" Back Together</h2> +<h2 id="_diffcore_merge_broken_for_putting_complete_rewrites_back_together">diffcore-merge-broken: For Putting "Complete Rewrites" Back Together</h2> <div class="sectionbody"> -<p>This transformation is used to merge filepairs broken by +<div class="para"><p>This transformation is used to merge filepairs broken by diffcore-break, and not transformed into rename/copy by diffcore-rename, back into a single modification. This always -runs when diffcore-break is used.</p> -<p>For the purpose of merging broken filepairs back, it uses a +runs when diffcore-break is used.</p></div> +<div class="para"><p>For the purpose of merging broken filepairs back, it uses a different "extent of changes" computation from the ones used by diffcore-break and diffcore-rename. It counts only the deletion from the original, and does not count insertion. If you removed @@ -483,13 +531,13 @@ rename/copy detection, but if filepairs broken that way were not matched with other filepairs to create rename/copy, then this transformation merges them back into the original -"modification".</p> -<p>The "extent of changes" parameter can be tweaked from the +"modification".</p></div> +<div class="para"><p>The "extent of changes" parameter can be tweaked from the default 80% (that is, unless more than 80% of the original material is deleted, the broken pairs are merged back into a single modification) by giving a second number to -B option, -like these:</p> -<ul> +like these:</p></div> +<div class="ilist"><ul> <li> <p> -B50/60 (give 50% "break score" to diffcore-break, use 60% @@ -501,46 +549,46 @@ -B/60 (the same as above, since diffcore-break defaults to 50%). </p> </li> -</ul> -<p>Note that earlier implementation left a broken pair as a separate +</ul></div> +<div class="para"><p>Note that earlier implementation left a broken pair as a separate creation and deletion patches. This was an unnecessary hack and the latest implementation always merges all the broken pairs back into modifications, but the resulting patch output is formatted differently for easier review in case of such a complete rewrite by showing the entire contents of old version prefixed with <em>-</em>, followed by the entire contents of new -version prefixed with <em>+</em>.</p> +version prefixed with <em>+</em>.</p></div> </div> -<h2>diffcore-pickaxe: For Detecting Addition/Deletion of Specified String</h2> +<h2 id="_diffcore_pickaxe_for_detecting_addition_deletion_of_specified_string">diffcore-pickaxe: For Detecting Addition/Deletion of Specified String</h2> <div class="sectionbody"> -<p>This transformation is used to find filepairs that represent +<div class="para"><p>This transformation is used to find filepairs that represent changes that touch a specified string, and is controlled by the --S option and the <tt>--pickaxe-all</tt> option to the <tt>git-diff-*</tt> -commands.</p> -<p>When diffcore-pickaxe is in use, it checks if there are +-S option and the <tt>--pickaxe-all</tt> option to the <em>git-diff-*</em> +commands.</p></div> +<div class="para"><p>When diffcore-pickaxe is in use, it checks if there are filepairs whose "original" side has the specified string and whose "result" side does not. Such a filepair represents "the string appeared in this changeset". It also checks for the -opposite case that loses the specified string.</p> -<p>When <tt>--pickaxe-all</tt> is not in effect, diffcore-pickaxe leaves +opposite case that loses the specified string.</p></div> +<div class="para"><p>When <tt>--pickaxe-all</tt> is not in effect, diffcore-pickaxe leaves only such filepairs that touch the specified string in its output. When <tt>--pickaxe-all</tt> is used, diffcore-pickaxe leaves all filepairs intact if there is such a filepair, or makes the output empty otherwise. The latter behaviour is designed to make reviewing of the changes in the context of the whole -changeset easier.</p> +changeset easier.</p></div> </div> -<h2>diffcore-order: For Sorting the Output Based on Filenames</h2> +<h2 id="_diffcore_order_for_sorting_the_output_based_on_filenames">diffcore-order: For Sorting the Output Based on Filenames</h2> <div class="sectionbody"> -<p>This is used to reorder the filepairs according to the user's +<div class="para"><p>This is used to reorder the filepairs according to the user's (or project's) taste, and is controlled by the -O option to the -<tt>git-diff-*</tt> commands.</p> -<p>This takes a text file each of whose lines is a shell glob +<em>git-diff-*</em> commands.</p></div> +<div class="para"><p>This takes a text file each of whose lines is a shell glob pattern. Filepairs that match a glob pattern on an earlier line in the file are output before ones that match a later line, and -filepairs that do not match any glob pattern are output last.</p> -<p>As an example, a typical orderfile for the core git probably -would look like this:</p> +filepairs that do not match any glob pattern are output last.</p></div> +<div class="para"><p>As an example, a typical orderfile for the core git probably +would look like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>README @@ -551,24 +599,24 @@ t</tt></pre> </div></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-diff.html">git-diff(1)</a>, +<div class="para"><p><a href="git-diff.html">git-diff(1)</a>, <a href="git-diff-files.html">git-diff-files(1)</a>, <a href="git-diff-index.html">git-diff-index(1)</a>, <a href="git-diff-tree.html">git-diff-tree(1)</a>, <a href="git-format-patch.html">git-format-patch(1)</a>, <a href="git-log.html">git-log(1)</a>, <a href="gitglossary.html">gitglossary(7)</a>, -<a href="user-manual.html">The Git User's Manual</a></p> +<a href="user-manual.html">The Git User's Manual</a></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite.</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:13 UTC +Last updated 2008-07-06 05:17:12 UTC </div> </div> </body> diff --git a/gitdiffcore.txt b/gitdiffcore.txt index 0b7daed..2bdbc3d 100644 --- a/gitdiffcore.txt +++ b/gitdiffcore.txt
@@ -7,34 +7,34 @@ SYNOPSIS -------- -git diff * +'git diff' * DESCRIPTION ----------- -The diff commands `git-diff-index`, `git-diff-files`, and `git-diff-tree` +The diff commands 'git-diff-index', 'git-diff-files', and 'git-diff-tree' can be told to manipulate differences they find in -unconventional ways before showing `diff` output. The manipulation +unconventional ways before showing 'diff' output. The manipulation is collectively called "diffcore transformation". This short note -describes what they are and how to use them to produce diff outputs -that are easier to understand than the conventional kind. +describes what they are and how to use them to produce 'diff' output +that is easier to understand than the conventional kind. The chain of operation ---------------------- -The `git-diff-{asterisk}` family works by first comparing two sets of +The 'git-diff-{asterisk}' family works by first comparing two sets of files: - - `git-diff-index` compares contents of a "tree" object and the + - 'git-diff-index' compares contents of a "tree" object and the working directory (when '\--cached' flag is not used) or a "tree" object and the index file (when '\--cached' flag is used); - - `git-diff-files` compares contents of the index file and the + - 'git-diff-files' compares contents of the index file and the working directory; - - `git-diff-tree` compares contents of two "tree" objects; + - 'git-diff-tree' compares contents of two "tree" objects; In all of these cases, the commands themselves compare corresponding paths in the two sets of files. The result of @@ -61,12 +61,12 @@ - diffcore-pickaxe - diffcore-order -These are applied in sequence. The set of filepairs `git-diff-{asterisk}` +These are applied in sequence. The set of filepairs 'git-diff-{asterisk}' commands find are used as the input to diffcore-pathspec, and the output from diffcore-pathspec is used as the input to the next transformation. The final result is then passed to the output routine and generates either diff-raw format (see Output -format sections of the manual for `git-diff-{asterisk}` commands) or +format sections of the manual for 'git-diff-{asterisk}' commands) or diff-patch format. @@ -75,7 +75,7 @@ The first transformation in the chain is diffcore-pathspec, and is controlled by giving the pathname parameters to the -`git-diff-{asterisk}` commands on the command line. The pathspec is used +'git-diff-{asterisk}' commands on the command line. The pathspec is used to limit the world diff operates in. It removes the filepairs outside the specified set of pathnames. E.g. If the input set of filepairs included: @@ -88,7 +88,7 @@ junkfile entry would be removed from the list because only "myfile" is under consideration. -Implementation note. For performance reasons, `git-diff-tree` +Implementation note. For performance reasons, 'git-diff-tree' uses the pathname parameters on the command line to cull set of filepairs it feeds the diffcore mechanism itself, and does not use diffcore-pathspec, but the end result is the same. @@ -98,7 +98,7 @@ ---------------------------------------------------- The second transformation in the chain is diffcore-break, and is -controlled by the -B option to the `git-diff-{asterisk}` commands. This is +controlled by the -B option to the 'git-diff-{asterisk}' commands. This is used to detect a filepair that represents "complete rewrite" and break such filepair into two filepairs that represent delete and create. E.g. If the input contained this filepair: @@ -134,7 +134,7 @@ This transformation is used to detect renames and copies, and is controlled by the -M option (to detect renames) and the -C option -(to detect copies as well) to the `git-diff-{asterisk}` commands. If the +(to detect copies as well) to the 'git-diff-{asterisk}' commands. If the input contained these filepairs: ------------------------------------------------ @@ -179,11 +179,11 @@ 8/10 = 80%). Note. When the "-C" option is used with `\--find-copies-harder` -option, `git-diff-{asterisk}` commands feed unmodified filepairs to +option, 'git-diff-{asterisk}' commands feed unmodified filepairs to diffcore mechanism as well as modified ones. This lets the copy detector consider unmodified files as copy source candidates at the expense of making it slower. Without `\--find-copies-harder`, -`git-diff-{asterisk}` commands can detect copies only if the file that was +'git-diff-{asterisk}' commands can detect copies only if the file that was copied happened to have been modified in the same changeset. @@ -234,7 +234,7 @@ This transformation is used to find filepairs that represent changes that touch a specified string, and is controlled by the --S option and the `\--pickaxe-all` option to the `git-diff-{asterisk}` +-S option and the `\--pickaxe-all` option to the 'git-diff-{asterisk}' commands. When diffcore-pickaxe is in use, it checks if there are @@ -257,7 +257,7 @@ This is used to reorder the filepairs according to the user's (or project's) taste, and is controlled by the -O option to the -`git-diff-{asterisk}` commands. +'git-diff-{asterisk}' commands. This takes a text file each of whose lines is a shell glob pattern. Filepairs that match a glob pattern on an earlier line diff --git a/githooks.html b/githooks.html index f130c11..6be1cda 100644 --- a/githooks.html +++ b/githooks.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>githooks(5)</title> </head> @@ -272,163 +320,163 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p>$GIT_DIR/hooks/*</p> +<div class="para"><p>$GIT_DIR/hooks/*</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Hooks are little scripts you can place in <tt>$GIT_DIR/hooks</tt> +<div class="para"><p>Hooks are little scripts you can place in <tt>$GIT_DIR/hooks</tt> directory to trigger action at certain points. When -<tt>git-init</tt> is run, a handful example hooks are copied in the +<em>git-init</em> is run, a handful example hooks are copied in the <tt>hooks</tt> directory of the new repository, but by default they are all disabled. To enable a hook, rename it by removing its <tt>.sample</tt> -suffix.</p> -<p>This document describes the currently defined hooks.</p> +suffix.</p></div> +<div class="para"><p>This document describes the currently defined hooks.</p></div> </div> -<h2>applypatch-msg</h2> +<h2 id="_applypatch_msg">applypatch-msg</h2> <div class="sectionbody"> -<p>This hook is invoked by <tt>git-am</tt> script. It takes a single +<div class="para"><p>This hook is invoked by <em>git-am</em> script. It takes a single parameter, the name of the file that holds the proposed commit log message. Exiting with non-zero status causes -<tt>git-am</tt> to abort before applying the patch.</p> -<p>The hook is allowed to edit the message file in place, and can +<em>git-am</em> to abort before applying the patch.</p></div> +<div class="para"><p>The hook is allowed to edit the message file in place, and can be used to normalize the message into some project standard format (if the project has one). It can also be used to refuse -the commit after inspecting the message file.</p> -<p>The default <em>applypatch-msg</em> hook, when enabled, runs the -<em>commit-msg</em> hook, if the latter is enabled.</p> +the commit after inspecting the message file.</p></div> +<div class="para"><p>The default <em>applypatch-msg</em> hook, when enabled, runs the +<em>commit-msg</em> hook, if the latter is enabled.</p></div> </div> -<h2>pre-applypatch</h2> +<h2 id="_pre_applypatch">pre-applypatch</h2> <div class="sectionbody"> -<p>This hook is invoked by <tt>git-am</tt>. It takes no parameter, and is -invoked after the patch is applied, but before a commit is made.</p> -<p>If it exits with non-zero status, then the working tree will not be -committed after applying the patch.</p> -<p>It can be used to inspect the current working tree and refuse to -make a commit if it does not pass certain test.</p> -<p>The default <em>pre-applypatch</em> hook, when enabled, runs the -<em>pre-commit</em> hook, if the latter is enabled.</p> +<div class="para"><p>This hook is invoked by <em>git-am</em>. It takes no parameter, and is +invoked after the patch is applied, but before a commit is made.</p></div> +<div class="para"><p>If it exits with non-zero status, then the working tree will not be +committed after applying the patch.</p></div> +<div class="para"><p>It can be used to inspect the current working tree and refuse to +make a commit if it does not pass certain test.</p></div> +<div class="para"><p>The default <em>pre-applypatch</em> hook, when enabled, runs the +<em>pre-commit</em> hook, if the latter is enabled.</p></div> </div> -<h2>post-applypatch</h2> +<h2 id="_post_applypatch">post-applypatch</h2> <div class="sectionbody"> -<p>This hook is invoked by <tt>git-am</tt>. It takes no parameter, -and is invoked after the patch is applied and a commit is made.</p> -<p>This hook is meant primarily for notification, and cannot affect -the outcome of <tt>git-am</tt>.</p> +<div class="para"><p>This hook is invoked by <em>git-am</em>. It takes no parameter, +and is invoked after the patch is applied and a commit is made.</p></div> +<div class="para"><p>This hook is meant primarily for notification, and cannot affect +the outcome of <em>git-am</em>.</p></div> </div> -<h2>pre-commit</h2> +<h2 id="_pre_commit">pre-commit</h2> <div class="sectionbody"> -<p>This hook is invoked by <tt>git-commit</tt>, and can be bypassed +<div class="para"><p>This hook is invoked by <em>git-commit</em>, and can be bypassed with <tt>--no-verify</tt> option. It takes no parameter, and is invoked before obtaining the proposed commit log message and making a commit. Exiting with non-zero status from this script -causes the <tt>git-commit</tt> to abort.</p> -<p>The default <em>pre-commit</em> hook, when enabled, catches introduction +causes the <em>git-commit</em> to abort.</p></div> +<div class="para"><p>The default <em>pre-commit</em> hook, when enabled, catches introduction of lines with trailing whitespaces and aborts the commit when -such a line is found.</p> -<p>All the <tt>git-commit</tt> hooks are invoked with the environment +such a line is found.</p></div> +<div class="para"><p>All the <em>git-commit</em> hooks are invoked with the environment variable <tt>GIT_EDITOR=:</tt> if the command will not bring up an editor -to modify the commit message.</p> +to modify the commit message.</p></div> </div> -<h2>prepare-commit-msg</h2> +<h2 id="_prepare_commit_msg">prepare-commit-msg</h2> <div class="sectionbody"> -<p>This hook is invoked by <tt>git-commit</tt> right after preparing the -default log message, and before the editor is started.</p> -<p>It takes one to three parameters. The first is the name of the file +<div class="para"><p>This hook is invoked by <em>git-commit</em> right after preparing the +default log message, and before the editor is started.</p></div> +<div class="para"><p>It takes one to three parameters. The first is the name of the file that the commit log message. The second is the source of the commit message, and can be: <tt>message</tt> (if a <tt>\-m</tt> or <tt>\-F</tt> option was given); <tt>template</tt> (if a <tt>\-t</tt> option was given or the configuration option <tt>commit.template</tt> is set); <tt>merge</tt> (if the commit is a merge or a <tt>.git/MERGE_MSG</tt> file exists); <tt>squash</tt> (if a <tt>.git/SQUASH_MSG</tt> file exists); or <tt>commit</tt>, followed by -a commit SHA1 (if a <tt>\-c</tt>, <tt>\-C</tt> or <tt>--amend</tt> option was given).</p> -<p>If the exit status is non-zero, <tt>git-commit</tt> will abort.</p> -<p>The purpose of the hook is to edit the message file in place, and +a commit SHA1 (if a <tt>\-c</tt>, <tt>\-C</tt> or <tt>--amend</tt> option was given).</p></div> +<div class="para"><p>If the exit status is non-zero, <em>git-commit</em> will abort.</p></div> +<div class="para"><p>The purpose of the hook is to edit the message file in place, and it is not suppressed by the <tt>--no-verify</tt> option. A non-zero exit means a failure of the hook and aborts the commit. It should not -be used as replacement for pre-commit hook.</p> -<p>The sample <tt>prepare-commit-msg</tt> hook that comes with git comments -out the <tt>Conflicts:</tt> part of a merge's commit message.</p> +be used as replacement for pre-commit hook.</p></div> +<div class="para"><p>The sample <tt>prepare-commit-msg</tt> hook that comes with git comments +out the <tt>Conflicts:</tt> part of a merge's commit message.</p></div> </div> -<h2>commit-msg</h2> +<h2 id="_commit_msg">commit-msg</h2> <div class="sectionbody"> -<p>This hook is invoked by <tt>git-commit</tt>, and can be bypassed +<div class="para"><p>This hook is invoked by <em>git-commit</em>, and can be bypassed with <tt>--no-verify</tt> option. It takes a single parameter, the name of the file that holds the proposed commit log message. -Exiting with non-zero status causes the <tt>git-commit</tt> to -abort.</p> -<p>The hook is allowed to edit the message file in place, and can +Exiting with non-zero status causes the <em>git-commit</em> to +abort.</p></div> +<div class="para"><p>The hook is allowed to edit the message file in place, and can be used to normalize the message into some project standard format (if the project has one). It can also be used to refuse -the commit after inspecting the message file.</p> -<p>The default <em>commit-msg</em> hook, when enabled, detects duplicate -"Signed-off-by" lines, and aborts the commit if one is found.</p> +the commit after inspecting the message file.</p></div> +<div class="para"><p>The default <em>commit-msg</em> hook, when enabled, detects duplicate +"Signed-off-by" lines, and aborts the commit if one is found.</p></div> </div> -<h2>post-commit</h2> +<h2 id="_post_commit">post-commit</h2> <div class="sectionbody"> -<p>This hook is invoked by <tt>git-commit</tt>. It takes no -parameter, and is invoked after a commit is made.</p> -<p>This hook is meant primarily for notification, and cannot affect -the outcome of <tt>git-commit</tt>.</p> +<div class="para"><p>This hook is invoked by <em>git-commit</em>. It takes no +parameter, and is invoked after a commit is made.</p></div> +<div class="para"><p>This hook is meant primarily for notification, and cannot affect +the outcome of <em>git-commit</em>.</p></div> </div> -<h2>post-checkout</h2> +<h2 id="_post_checkout">post-checkout</h2> <div class="sectionbody"> -<p>This hook is invoked when a <tt>git-checkout</tt> is run after having updated the +<div class="para"><p>This hook is invoked when a <em>git-checkout</em> is run after having updated the worktree. The hook is given three parameters: the ref of the previous HEAD, the ref of the new HEAD (which may or may not have changed), and a flag indicating whether the checkout was a branch checkout (changing branches, flag=1) or a file checkout (retrieving a file from the index, flag=0). -This hook cannot affect the outcome of <tt>git-checkout</tt>.</p> -<p>This hook can be used to perform repository validity checks, auto-display +This hook cannot affect the outcome of <em>git-checkout</em>.</p></div> +<div class="para"><p>This hook can be used to perform repository validity checks, auto-display differences from the previous HEAD if different, or set working dir metadata -properties.</p> +properties.</p></div> </div> -<h2>post-merge</h2> +<h2 id="_post_merge">post-merge</h2> <div class="sectionbody"> -<p>This hook is invoked by <tt>git-merge</tt>, which happens when a <tt>git-pull</tt> +<div class="para"><p>This hook is invoked by <em>git-merge</em>, which happens when a <em>git-pull</em> is done on a local repository. The hook takes a single parameter, a status flag specifying whether or not the merge being done was a squash merge. -This hook cannot affect the outcome of <tt>git-merge</tt> and is not executed, -if the merge failed due to conflicts.</p> -<p>This hook can be used in conjunction with a corresponding pre-commit hook to +This hook cannot affect the outcome of <em>git-merge</em> and is not executed, +if the merge failed due to conflicts.</p></div> +<div class="para"><p>This hook can be used in conjunction with a corresponding pre-commit hook to save and restore any form of metadata associated with the working tree (eg: permissions/ownership, ACLS, etc). See contrib/hooks/setgitperms.perl -for an example of how to do this.</p> +for an example of how to do this.</p></div> </div> -<h2><a id="pre-receive"></a>pre-receive</h2> +<h2 id="pre-receive">pre-receive</h2> <div class="sectionbody"> -<p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository, -which happens when a <tt>git-push</tt> is done on a local repository. +<div class="para"><p>This hook is invoked by <em>git-receive-pack</em> on the remote repository, +which happens when a <em>git-push</em> is done on a local repository. Just before starting to update refs on the remote repository, the pre-receive hook is invoked. Its exit status determines the success -or failure of the update.</p> -<p>This hook executes once for the receive operation. It takes no +or failure of the update.</p></div> +<div class="para"><p>This hook executes once for the receive operation. It takes no arguments, but for each ref to be updated it receives on standard -input a line of the format:</p> +input a line of the format:</p></div> <div class="literalblock"> <div class="content"> <pre><tt><old-value> SP <new-value> SP <ref-name> LF</tt></pre> </div></div> -<p>where <tt><old-value></tt> is the old object name stored in the ref, +<div class="para"><p>where <tt><old-value></tt> is the old object name stored in the ref, <tt><new-value></tt> is the new object name to be stored in the ref and <tt><ref-name></tt> is the full name of the ref. -When creating a new ref, <tt><old-value></tt> is 40 <tt>0</tt>.</p> -<p>If the hook exits with non-zero status, none of the refs will be +When creating a new ref, <tt><old-value></tt> is 40 <tt>0</tt>.</p></div> +<div class="para"><p>If the hook exits with non-zero status, none of the refs will be updated. If the hook exits with zero, updating of individual refs can -still be prevented by the <a href="#update"><em>update</em></a> hook.</p> -<p>Both standard output and standard error output are forwarded to -<tt>git-send-pack</tt> on the other end, so you can simply <tt>echo</tt> messages -for the user.</p> +still be prevented by the <a href="#update"><em>update</em></a> hook.</p></div> +<div class="para"><p>Both standard output and standard error output are forwarded to +<em>git-send-pack</em> on the other end, so you can simply <tt>echo</tt> messages +for the user.</p></div> </div> -<h2><a id="update"></a>update</h2> +<h2 id="update">update</h2> <div class="sectionbody"> -<p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository, -which happens when a <tt>git-push</tt> is done on a local repository. +<div class="para"><p>This hook is invoked by <em>git-receive-pack</em> on the remote repository, +which happens when a <em>git-push</em> is done on a local repository. Just before updating the ref on the remote repository, the update hook is invoked. Its exit status determines the success or failure of -the ref update.</p> -<p>The hook executes once for each ref to be updated, and takes -three parameters:</p> -<ul> +the ref update.</p></div> +<div class="para"><p>The hook executes once for each ref to be updated, and takes +three parameters:</p></div> +<div class="ilist"><ul> <li> <p> the name of the ref being updated, @@ -444,89 +492,89 @@ and the new objectname to be stored in the ref. </p> </li> -</ul> -<p>A zero exit from the update hook allows the ref to be updated. -Exiting with a non-zero status prevents <tt>git-receive-pack</tt> -from updating that ref.</p> -<p>This hook can be used to prevent <em>forced</em> update on certain refs by +</ul></div> +<div class="para"><p>A zero exit from the update hook allows the ref to be updated. +Exiting with a non-zero status prevents <em>git-receive-pack</em> +from updating that ref.</p></div> +<div class="para"><p>This hook can be used to prevent <em>forced</em> update on certain refs by making sure that the object name is a commit object that is a descendant of the commit object named by the old object name. -That is, to enforce a "fast forward only" policy.</p> -<p>It could also be used to log the old..new status. However, it +That is, to enforce a "fast forward only" policy.</p></div> +<div class="para"><p>It could also be used to log the old..new status. However, it does not know the entire set of branches, so it would end up firing one e-mail per ref when used naively, though. The -<a href="#post-receive"><em>post-receive</em></a> hook is more suited to that.</p> -<p>Another use suggested on the mailing list is to use this hook to +<a href="#post-receive"><em>post-receive</em></a> hook is more suited to that.</p></div> +<div class="para"><p>Another use suggested on the mailing list is to use this hook to implement access control which is finer grained than the one -based on filesystem group.</p> -<p>Both standard output and standard error output are forwarded to -<tt>git-send-pack</tt> on the other end, so you can simply <tt>echo</tt> messages -for the user.</p> -<p>The default <em>update</em> hook, when enabled--and with +based on filesystem group.</p></div> +<div class="para"><p>Both standard output and standard error output are forwarded to +<em>git-send-pack</em> on the other end, so you can simply <tt>echo</tt> messages +for the user.</p></div> +<div class="para"><p>The default <em>update</em> hook, when enabled--and with <tt>hooks.allowunannotated</tt> config option turned on--prevents -unannotated tags to be pushed.</p> +unannotated tags to be pushed.</p></div> </div> -<h2><a id="post-receive"></a>post-receive</h2> +<h2 id="post-receive">post-receive</h2> <div class="sectionbody"> -<p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository, -which happens when a <tt>git-push</tt> is done on a local repository. +<div class="para"><p>This hook is invoked by <em>git-receive-pack</em> on the remote repository, +which happens when a <em>git-push</em> is done on a local repository. It executes on the remote repository once after all the refs have -been updated.</p> -<p>This hook executes once for the receive operation. It takes no +been updated.</p></div> +<div class="para"><p>This hook executes once for the receive operation. It takes no arguments, but gets the same information as the <a href="#pre-receive"><em>pre-receive</em></a> -hook does on its standard input.</p> -<p>This hook does not affect the outcome of <tt>git-receive-pack</tt>, as it -is called after the real work is done.</p> -<p>This supersedes the <a href="#post-update"><em>post-update</em></a> hook in that it gets +hook does on its standard input.</p></div> +<div class="para"><p>This hook does not affect the outcome of <em>git-receive-pack</em>, as it +is called after the real work is done.</p></div> +<div class="para"><p>This supersedes the <a href="#post-update"><em>post-update</em></a> hook in that it gets both old and new values of all the refs in addition to their -names.</p> -<p>Both standard output and standard error output are forwarded to -<tt>git-send-pack</tt> on the other end, so you can simply <tt>echo</tt> messages -for the user.</p> -<p>The default <em>post-receive</em> hook is empty, but there is +names.</p></div> +<div class="para"><p>Both standard output and standard error output are forwarded to +<em>git-send-pack</em> on the other end, so you can simply <tt>echo</tt> messages +for the user.</p></div> +<div class="para"><p>The default <em>post-receive</em> hook is empty, but there is a sample script <tt>post-receive-email</tt> provided in the <tt>contrib/hooks</tt> directory in git distribution, which implements sending commit -emails.</p> +emails.</p></div> </div> -<h2><a id="post-update"></a>post-update</h2> +<h2 id="post-update">post-update</h2> <div class="sectionbody"> -<p>This hook is invoked by <tt>git-receive-pack</tt> on the remote repository, -which happens when a <tt>git-push</tt> is done on a local repository. +<div class="para"><p>This hook is invoked by <em>git-receive-pack</em> on the remote repository, +which happens when a <em>git-push</em> is done on a local repository. It executes on the remote repository once after all the refs have -been updated.</p> -<p>It takes a variable number of parameters, each of which is the -name of ref that was actually updated.</p> -<p>This hook is meant primarily for notification, and cannot affect -the outcome of <tt>git-receive-pack</tt>.</p> -<p>The <em>post-update</em> hook can tell what are the heads that were pushed, +been updated.</p></div> +<div class="para"><p>It takes a variable number of parameters, each of which is the +name of ref that was actually updated.</p></div> +<div class="para"><p>This hook is meant primarily for notification, and cannot affect +the outcome of <em>git-receive-pack</em>.</p></div> +<div class="para"><p>The <em>post-update</em> hook can tell what are the heads that were pushed, but it does not know what their original and updated values are, so it is a poor place to do log old..new. The <a href="#post-receive"><em>post-receive</em></a> hook does get both original and updated values of the refs. You might consider it instead if you need -them.</p> -<p>When enabled, the default <em>post-update</em> hook runs -<tt>git-update-server-info</tt> to keep the information used by dumb +them.</p></div> +<div class="para"><p>When enabled, the default <em>post-update</em> hook runs +<em>git-update-server-info</em> to keep the information used by dumb transports (e.g., HTTP) up-to-date. If you are publishing a git repository that is accessible via HTTP, you should -probably enable this hook.</p> -<p>Both standard output and standard error output are forwarded to -<tt>git-send-pack</tt> on the other end, so you can simply <tt>echo</tt> messages -for the user.</p> +probably enable this hook.</p></div> +<div class="para"><p>Both standard output and standard error output are forwarded to +<em>git-send-pack</em> on the other end, so you can simply <tt>echo</tt> messages +for the user.</p></div> </div> -<h2>pre-auto-gc</h2> +<h2 id="_pre_auto_gc">pre-auto-gc</h2> <div class="sectionbody"> -<p>This hook is invoked by <tt>git-gc --auto</tt>. It takes no parameter, and -exiting with non-zero status from this script causes the <tt>git-gc --auto</tt> -to abort.</p> +<div class="para"><p>This hook is invoked by <em>git-gc --auto</em>. It takes no parameter, and +exiting with non-zero status from this script causes the <em>git-gc --auto</em> +to abort.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:10 UTC +Last updated 2008-07-06 05:17:10 UTC </div> </div> </body> diff --git a/githooks.txt b/githooks.txt index 6a0d098..046a2a7 100644 --- a/githooks.txt +++ b/githooks.txt
@@ -15,7 +15,7 @@ Hooks are little scripts you can place in `$GIT_DIR/hooks` directory to trigger action at certain points. When -`git-init` is run, a handful example hooks are copied in the +'git-init' is run, a handful example hooks are copied in the `hooks` directory of the new repository, but by default they are all disabled. To enable a hook, rename it by removing its `.sample` suffix. @@ -25,10 +25,10 @@ applypatch-msg -------------- -This hook is invoked by `git-am` script. It takes a single +This hook is invoked by 'git-am' script. It takes a single parameter, the name of the file that holds the proposed commit log message. Exiting with non-zero status causes -`git-am` to abort before applying the patch. +'git-am' to abort before applying the patch. The hook is allowed to edit the message file in place, and can be used to normalize the message into some project standard @@ -41,7 +41,7 @@ pre-applypatch -------------- -This hook is invoked by `git-am`. It takes no parameter, and is +This hook is invoked by 'git-am'. It takes no parameter, and is invoked after the patch is applied, but before a commit is made. If it exits with non-zero status, then the working tree will not be @@ -56,33 +56,33 @@ post-applypatch --------------- -This hook is invoked by `git-am`. It takes no parameter, +This hook is invoked by 'git-am'. It takes no parameter, and is invoked after the patch is applied and a commit is made. This hook is meant primarily for notification, and cannot affect -the outcome of `git-am`. +the outcome of 'git-am'. pre-commit ---------- -This hook is invoked by `git-commit`, and can be bypassed +This hook is invoked by 'git-commit', and can be bypassed with `\--no-verify` option. It takes no parameter, and is invoked before obtaining the proposed commit log message and making a commit. Exiting with non-zero status from this script -causes the `git-commit` to abort. +causes the 'git-commit' to abort. The default 'pre-commit' hook, when enabled, catches introduction of lines with trailing whitespaces and aborts the commit when such a line is found. -All the `git-commit` hooks are invoked with the environment +All the 'git-commit' hooks are invoked with the environment variable `GIT_EDITOR=:` if the command will not bring up an editor to modify the commit message. prepare-commit-msg ------------------ -This hook is invoked by `git-commit` right after preparing the +This hook is invoked by 'git-commit' right after preparing the default log message, and before the editor is started. It takes one to three parameters. The first is the name of the file @@ -94,7 +94,7 @@ (if a `.git/SQUASH_MSG` file exists); or `commit`, followed by a commit SHA1 (if a `\-c`, `\-C` or `\--amend` option was given). -If the exit status is non-zero, `git-commit` will abort. +If the exit status is non-zero, 'git-commit' will abort. The purpose of the hook is to edit the message file in place, and it is not suppressed by the `\--no-verify` option. A non-zero exit @@ -107,10 +107,10 @@ commit-msg ---------- -This hook is invoked by `git-commit`, and can be bypassed +This hook is invoked by 'git-commit', and can be bypassed with `\--no-verify` option. It takes a single parameter, the name of the file that holds the proposed commit log message. -Exiting with non-zero status causes the `git-commit` to +Exiting with non-zero status causes the 'git-commit' to abort. The hook is allowed to edit the message file in place, and can @@ -124,21 +124,21 @@ post-commit ----------- -This hook is invoked by `git-commit`. It takes no +This hook is invoked by 'git-commit'. It takes no parameter, and is invoked after a commit is made. This hook is meant primarily for notification, and cannot affect -the outcome of `git-commit`. +the outcome of 'git-commit'. post-checkout ----------- -This hook is invoked when a `git-checkout` is run after having updated the +This hook is invoked when a 'git-checkout' is run after having updated the worktree. The hook is given three parameters: the ref of the previous HEAD, the ref of the new HEAD (which may or may not have changed), and a flag indicating whether the checkout was a branch checkout (changing branches, flag=1) or a file checkout (retrieving a file from the index, flag=0). -This hook cannot affect the outcome of `git-checkout`. +This hook cannot affect the outcome of 'git-checkout'. This hook can be used to perform repository validity checks, auto-display differences from the previous HEAD if different, or set working dir metadata @@ -147,10 +147,10 @@ post-merge ----------- -This hook is invoked by `git-merge`, which happens when a `git-pull` +This hook is invoked by 'git-merge', which happens when a 'git-pull' is done on a local repository. The hook takes a single parameter, a status flag specifying whether or not the merge being done was a squash merge. -This hook cannot affect the outcome of `git-merge` and is not executed, +This hook cannot affect the outcome of 'git-merge' and is not executed, if the merge failed due to conflicts. This hook can be used in conjunction with a corresponding pre-commit hook to @@ -162,8 +162,8 @@ pre-receive ----------- -This hook is invoked by `git-receive-pack` on the remote repository, -which happens when a `git-push` is done on a local repository. +This hook is invoked by 'git-receive-pack' on the remote repository, +which happens when a 'git-push' is done on a local repository. Just before starting to update refs on the remote repository, the pre-receive hook is invoked. Its exit status determines the success or failure of the update. @@ -184,15 +184,15 @@ still be prevented by the <<update,'update'>> hook. Both standard output and standard error output are forwarded to -`git-send-pack` on the other end, so you can simply `echo` messages +'git-send-pack' on the other end, so you can simply `echo` messages for the user. [[update]] update ------ -This hook is invoked by `git-receive-pack` on the remote repository, -which happens when a `git-push` is done on a local repository. +This hook is invoked by 'git-receive-pack' on the remote repository, +which happens when a 'git-push' is done on a local repository. Just before updating the ref on the remote repository, the update hook is invoked. Its exit status determines the success or failure of the ref update. @@ -205,7 +205,7 @@ - and the new objectname to be stored in the ref. A zero exit from the update hook allows the ref to be updated. -Exiting with a non-zero status prevents `git-receive-pack` +Exiting with a non-zero status prevents 'git-receive-pack' from updating that ref. This hook can be used to prevent 'forced' update on certain refs by @@ -223,7 +223,7 @@ based on filesystem group. Both standard output and standard error output are forwarded to -`git-send-pack` on the other end, so you can simply `echo` messages +'git-send-pack' on the other end, so you can simply `echo` messages for the user. The default 'update' hook, when enabled--and with @@ -234,8 +234,8 @@ post-receive ------------ -This hook is invoked by `git-receive-pack` on the remote repository, -which happens when a `git-push` is done on a local repository. +This hook is invoked by 'git-receive-pack' on the remote repository, +which happens when a 'git-push' is done on a local repository. It executes on the remote repository once after all the refs have been updated. @@ -244,7 +244,7 @@ <<pre-receive,'pre-receive'>> hook does on its standard input. -This hook does not affect the outcome of `git-receive-pack`, as it +This hook does not affect the outcome of 'git-receive-pack', as it is called after the real work is done. This supersedes the <<post-update,'post-update'>> hook in that it gets @@ -252,7 +252,7 @@ names. Both standard output and standard error output are forwarded to -`git-send-pack` on the other end, so you can simply `echo` messages +'git-send-pack' on the other end, so you can simply `echo` messages for the user. The default 'post-receive' hook is empty, but there is @@ -264,8 +264,8 @@ post-update ----------- -This hook is invoked by `git-receive-pack` on the remote repository, -which happens when a `git-push` is done on a local repository. +This hook is invoked by 'git-receive-pack' on the remote repository, +which happens when a 'git-push' is done on a local repository. It executes on the remote repository once after all the refs have been updated. @@ -273,7 +273,7 @@ name of ref that was actually updated. This hook is meant primarily for notification, and cannot affect -the outcome of `git-receive-pack`. +the outcome of 'git-receive-pack'. The 'post-update' hook can tell what are the heads that were pushed, but it does not know what their original and updated values are, @@ -283,20 +283,20 @@ them. When enabled, the default 'post-update' hook runs -`git-update-server-info` to keep the information used by dumb +'git-update-server-info' to keep the information used by dumb transports (e.g., HTTP) up-to-date. If you are publishing a git repository that is accessible via HTTP, you should probably enable this hook. Both standard output and standard error output are forwarded to -`git-send-pack` on the other end, so you can simply `echo` messages +'git-send-pack' on the other end, so you can simply `echo` messages for the user. pre-auto-gc ----------- -This hook is invoked by `git-gc --auto`. It takes no parameter, and -exiting with non-zero status from this script causes the `git-gc --auto` +This hook is invoked by 'git-gc --auto'. It takes no parameter, and +exiting with non-zero status from this script causes the 'git-gc --auto' to abort. GIT
diff --git a/gitignore.html b/gitignore.html index f5292ed..3c8799b 100644 --- a/gitignore.html +++ b/gitignore.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>gitignore(5)</title> </head> @@ -272,18 +320,18 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p>$GIT_DIR/info/exclude, .gitignore</p> +<div class="para"><p>$GIT_DIR/info/exclude, .gitignore</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>A <tt>gitignore</tt> file specifies intentionally untracked files that +<div class="para"><p>A <tt>gitignore</tt> file specifies intentionally untracked files that git should ignore. Each line in a <tt>gitignore</tt> file specifies a -pattern.</p> -<p>When deciding whether to ignore a path, git normally checks +pattern.</p></div> +<div class="para"><p>When deciding whether to ignore a path, git normally checks <tt>gitignore</tt> patterns from multiple sources, with the following order of precedence, from highest to lowest (within one level of -precedence, the last matching pattern decides the outcome):</p> -<ul> +precedence, the last matching pattern decides the outcome):</p></div> +<div class="ilist"><ul> <li> <p> Patterns read from the command line for those commands that support @@ -313,8 +361,8 @@ variable <em>core.excludesfile</em>. </p> </li> -</ul> -<p>Which file to place a pattern in depends on how the pattern is meant to +</ul></div> +<div class="para"><p>Which file to place a pattern in depends on how the pattern is meant to be used. Patterns which should be version-controlled and distributed to other repositories via clone (i.e., files that all developers will want to ignore) should go into a <tt>.gitignore</tt> file. Patterns which are @@ -324,15 +372,15 @@ the <tt>$GIT_DIR/info/exclude</tt> file. Patterns which a user wants git to ignore in all situations (e.g., backup or temporary files generated by the user's editor of choice) generally go into a file specified by -<tt>core.excludesfile</tt> in the user's <tt>~/.gitconfig</tt>.</p> -<p>The underlying git plumbing tools, such as -<tt>git-ls-files</tt> and <tt>git-read-tree</tt>, read +<tt>core.excludesfile</tt> in the user's <tt>~/.gitconfig</tt>.</p></div> +<div class="para"><p>The underlying git plumbing tools, such as +<em>git-ls-files</em> and <em>git-read-tree</em>, read <tt>gitignore</tt> patterns specified by command-line options, or from files specified by command-line options. Higher-level git -tools, such as <tt>git-status</tt> and <tt>git-add</tt>, -use patterns from the sources specified above.</p> -<p>Patterns have the following format:</p> -<ul> +tools, such as <em>git-status</em> and <em>git-add</em>, +use patterns from the sources specified above.</p></div> +<div class="para"><p>Patterns have the following format:</p></div> +<div class="ilist"><ul> <li> <p> A blank line matches no files, so it can serve as a separator @@ -381,8 +429,8 @@ "cat-file.c" but not "mozilla-sha1/sha1.c". </p> </li> -</ul> -<p>An example:</p> +</ul></div> +<div class="para"><p>An example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git status @@ -410,7 +458,7 @@ # Documentation/foo.html [...]</tt></pre> </div></div> -<p>Another example:</p> +<div class="para"><p>Another example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ cat .gitignore @@ -419,21 +467,21 @@ arch/foo/kernel/vmlinux.lds.S $ echo '!/vmlinux*' >arch/foo/kernel/.gitignore</tt></pre> </div></div> -<p>The second .gitignore prevents git from ignoring -<tt>arch/foo/kernel/vmlinux.lds.S</tt>.</p> +<div class="para"><p>The second .gitignore prevents git from ignoring +<tt>arch/foo/kernel/vmlinux.lds.S</tt>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano, Josh Triplett, -Frank Lichtenheld, and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano, Josh Triplett, +Frank Lichtenheld, and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:10 UTC +Last updated 2008-07-06 05:17:10 UTC </div> </div> </body> diff --git a/gitignore.txt b/gitignore.txt index cafdac7..fc0efd8 100644 --- a/gitignore.txt +++ b/gitignore.txt
@@ -51,10 +51,10 @@ `core.excludesfile` in the user's `~/.gitconfig`. The underlying git plumbing tools, such as -`git-ls-files` and `git-read-tree`, read +'git-ls-files' and 'git-read-tree', read `gitignore` patterns specified by command-line options, or from files specified by command-line options. Higher-level git -tools, such as `git-status` and `git-add`, +tools, such as 'git-status' and 'git-add', use patterns from the sources specified above. Patterns have the following format:
diff --git a/gitk.html b/gitk.html index 052195e..4217268 100644 --- a/gitk.html +++ b/gitk.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>gitk(1)</title> </head> @@ -272,24 +320,24 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>gitk</em> [<option>…] [<revs>] [--] [<path>…]</p> +<div class="para"><p><em>gitk</em> [<option>…] [<revs>] [--] [<path>…]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>Displays changes in a repository or a selected set of commits. This includes +<div class="para"><p>Displays changes in a repository or a selected set of commits. This includes visualizing the commit graph, showing information related to each commit, and -the files in the trees of each revision.</p> -<p>Historically, gitk was the first repository browser. It's written in tcl/tk +the files in the trees of each revision.</p></div> +<div class="para"><p>Historically, gitk was the first repository browser. It's written in tcl/tk and started off in a separate repository but was later merged into the main -git repository.</p> +git repository.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<p>To control which revisions to shown, the command takes options applicable to -the <tt>git-rev-list</tt> command (see <a href="git-rev-list.html">git-rev-list(1)</a>). +<div class="para"><p>To control which revisions to shown, the command takes options applicable to +the <em>git-rev-list</em> command (see <a href="git-rev-list.html">git-rev-list(1)</a>). This manual page describes only the most -frequently used options.</p> -<dl> +frequently used options.</p></div> +<div class="vlist"><dl> <dt> -n <number> </dt> @@ -358,11 +406,11 @@ from any preceding options. </p> </dd> -</dl> +</dl></div> </div> -<h2>Examples</h2> +<h2 id="_examples">Examples</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> gitk v2.6.12.. include/scsi drivers/scsi </dt> @@ -391,16 +439,16 @@ looking for changes in the current branch look in all branches. </p> </dd> -</dl> +</dl></div> </div> -<h2>Files</h2> +<h2 id="_files">Files</h2> <div class="sectionbody"> -<p>Gitk creates the .gitk file in your $HOME directory to store preferences -such as display options, font, and colors.</p> +<div class="para"><p>Gitk creates the .gitk file in your $HOME directory to store preferences +such as display options, font, and colors.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> <em>qgit(1)</em> </dt> @@ -427,24 +475,24 @@ in C using Ncurses. </p> </dd> -</dl> +</dl></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Paul Mackerras <paulus@samba.org>.</p> +<div class="para"><p>Written by Paul Mackerras <paulus@samba.org>.</p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano, Jonas Fonseca, and the git-list -<git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano, Jonas Fonseca, and the git-list +<git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:08 UTC +Last updated 2008-07-06 05:17:08 UTC </div> </div> </body> diff --git a/gitk.txt b/gitk.txt index 03688bf..e02ecf5 100644 --- a/gitk.txt +++ b/gitk.txt
@@ -22,7 +22,7 @@ OPTIONS ------- To control which revisions to shown, the command takes options applicable to -the `git-rev-list` command (see linkgit:git-rev-list[1]). +the 'git-rev-list' command (see linkgit:git-rev-list[1]). This manual page describes only the most frequently used options.
diff --git a/gitrepository-layout.html b/gitrepository-layout.html index 5e37a51..68353d7 100644 --- a/gitrepository-layout.html +++ b/gitrepository-layout.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>gitrepository-layout(5)</title> </head> @@ -272,17 +320,17 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p>$GIT_DIR/*</p> +<div class="para"><p>$GIT_DIR/*</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>You may find these things in your git repository (<tt>.git</tt> +<div class="para"><p>You may find these things in your git repository (<tt>.git</tt> directory for a repository associated with your working tree, or <tt><project>.git</tt> directory for a public <em>bare</em> repository. It is also possible to have a working tree where <tt>.git</tt> is a plain ascii file containing <tt>gitdir: <path></tt>, i.e. the path to the -real git repository).</p> -<dl> +real git repository).</p></div> +<div class="vlist"><dl> <dt> objects </dt> @@ -294,7 +342,7 @@ found in it), but there are couple of ways to violate it. </p> -<ol> +<div class="olist"><ol> <li> <p> You could populate the repository by running a commit walker @@ -322,7 +370,7 @@ it borrows from. </p> </li> -</ol> +</ol></div> </dd> <dt> objects/[0-9a-f][0-9a-f] @@ -365,7 +413,7 @@ are available in this object store. Whenever a pack is added or removed, <tt>git update-server-info</tt> should be run to keep this file up-to-date if the repository is - published for dumb transports. <tt>git-repack</tt> does this + published for dumb transports. <em>git-repack</em> does this by default. </p> </dd> @@ -401,7 +449,7 @@ <dd> <p> References are stored in subdirectories of this - directory. The <tt>git-prune</tt> command knows to keep + directory. The <em>git-prune</em> command knows to keep objects reachable from refs found in this directory and its subdirectories. </p> @@ -458,11 +506,11 @@ a symbolic link instead of a symref that points at the current branch. </p> -<p>HEAD can also record a specific commit directly, instead of +<div class="para"><p>HEAD can also record a specific commit directly, instead of being a symref to point at the current branch. Such a state is often called <em>detached HEAD</em>, and almost all commands work identically as normal. See <a href="git-checkout.html">git-checkout(1)</a> for -details.</p> +details.</p></div> </dd> <dt> branches @@ -470,7 +518,7 @@ <dd> <p> A slightly deprecated way to store shorthands to be used - to specify URL to <tt>git-fetch</tt>, <tt>git-pull</tt> and <tt>git-push</tt> + to specify URL to <em>git-fetch</em>, <em>git-pull</em> and <em>git-push</em> commands is to store a file in <tt>branches/<name></tt> and give <em>name</em> to these commands in place of <em>repository</em> argument. @@ -483,7 +531,7 @@ <p> Hooks are customization scripts used by various git commands. A handful of sample hooks are installed when - <tt>git-init</tt> is run, but all of them are disabled by + <em>git-init</em> is run, but all of them are disabled by default. To enable, they need to be made executable. Read <a href="githooks.html">githooks(5)</a> for more details about each hook. @@ -515,10 +563,10 @@ This file helps dumb transports discover what refs are available in this repository. If the repository is published for dumb transports, this file should be - regenerated by <tt>git-update-server-info</tt> every time a tag + regenerated by <em>git-update-server-info</em> every time a tag or branch is created or modified. This is normally done from the <tt>hooks/update</tt> hook, which is run by the - <tt>git-receive-pack</tt> command when you <tt>git-push</tt> into the + <em>git-receive-pack</em> command when you <em>git-push</em> into the repository. </p> </dd> @@ -542,8 +590,8 @@ <p> This file, by convention among Porcelains, stores the exclude pattern list. <tt>.gitignore</tt> is the per-directory - ignore file. <tt>git-status</tt>, <tt>git-add</tt>, <tt>git-rm</tt> and - <tt>git-clean</tt> look at it but the core git commands do not look + ignore file. <em>git-status</em>, <em>git-add</em>, <em>git-rm</em> and + <em>git-clean</em> look at it but the core git commands do not look at it. See also: <a href="gitignore.html">gitignore(5)</a>. </p> </dd> @@ -554,7 +602,7 @@ <p> Stores shorthands to be used to give URL and default refnames to interact with remote repository to - <tt>git-fetch</tt>, <tt>git-pull</tt> and <tt>git-push</tt> commands. + <em>git-fetch</em>, <em>git-pull</em> and <em>git-push</em> commands. </p> </dd> <dt> @@ -593,26 +641,26 @@ option to <a href="git-clone.html">git-clone(1)</a> and <a href="git-fetch.html">git-fetch(1)</a>. </p> </dd> -</dl> +</dl></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="git-init.html">git-init(1)</a>, +<div class="para"><p><a href="git-init.html">git-init(1)</a>, <a href="git-clone.html">git-clone(1)</a>, <a href="git-fetch.html">git-fetch(1)</a>, <a href="git-pack-refs.html">git-pack-refs(1)</a>, <a href="git-gc.html">git-gc(1)</a>, <a href="git-checkout.html">git-checkout(1)</a>, <a href="gitglossary.html">gitglossary(7)</a>, -<a href="user-manual.html">The Git User's Manual</a></p> +<a href="user-manual.html">The Git User's Manual</a></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite.</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:10 UTC +Last updated 2008-07-06 05:17:10 UTC </div> </div> </body> diff --git a/gitrepository-layout.txt b/gitrepository-layout.txt index ade812e..a969b3f 100644 --- a/gitrepository-layout.txt +++ b/gitrepository-layout.txt
@@ -64,7 +64,7 @@ are available in this object store. Whenever a pack is added or removed, `git update-server-info` should be run to keep this file up-to-date if the repository is - published for dumb transports. `git-repack` does this + published for dumb transports. 'git-repack' does this by default. objects/info/alternates:: @@ -85,7 +85,7 @@ refs:: References are stored in subdirectories of this - directory. The `git-prune` command knows to keep + directory. The 'git-prune' command knows to keep objects reachable from refs found in this directory and its subdirectories. @@ -125,7 +125,7 @@ branches:: A slightly deprecated way to store shorthands to be used - to specify URL to `git-fetch`, `git-pull` and `git-push` + to specify URL to 'git-fetch', 'git-pull' and 'git-push' commands is to store a file in `branches/<name>` and give 'name' to these commands in place of 'repository' argument. @@ -133,7 +133,7 @@ hooks:: Hooks are customization scripts used by various git commands. A handful of sample hooks are installed when - `git-init` is run, but all of them are disabled by + 'git-init' is run, but all of them are disabled by default. To enable, they need to be made executable. Read linkgit:githooks[5] for more details about each hook. @@ -150,10 +150,10 @@ This file helps dumb transports discover what refs are available in this repository. If the repository is published for dumb transports, this file should be - regenerated by `git-update-server-info` every time a tag + regenerated by 'git-update-server-info' every time a tag or branch is created or modified. This is normally done from the `hooks/update` hook, which is run by the - `git-receive-pack` command when you `git-push` into the + 'git-receive-pack' command when you 'git-push' into the repository. info/grafts:: @@ -167,14 +167,14 @@ info/exclude:: This file, by convention among Porcelains, stores the exclude pattern list. `.gitignore` is the per-directory - ignore file. `git-status`, `git-add`, `git-rm` and - `git-clean` look at it but the core git commands do not look + ignore file. 'git-status', 'git-add', 'git-rm' and + 'git-clean' look at it but the core git commands do not look at it. See also: linkgit:gitignore[5]. remotes:: Stores shorthands to be used to give URL and default refnames to interact with remote repository to - `git-fetch`, `git-pull` and `git-push` commands. + 'git-fetch', 'git-pull' and 'git-push' commands. logs:: Records of changes made to refs are stored in this
diff --git a/gittutorial-2.html b/gittutorial-2.html index c24a9fd..522ed1d 100644 --- a/gittutorial-2.html +++ b/gittutorial-2.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>gittutorial-2(7)</title> </head> @@ -272,19 +320,19 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p>git *</p> +<div class="para"><p>git *</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>You should work through <a href="gittutorial.html">gittutorial(7)</a> before reading this tutorial.</p> -<p>The goal of this tutorial is to introduce two fundamental pieces of +<div class="para"><p>You should work through <a href="gittutorial.html">gittutorial(7)</a> before reading this tutorial.</p></div> +<div class="para"><p>The goal of this tutorial is to introduce two fundamental pieces of git's architecture--the object database and the index file--and to provide the reader with everything necessary to understand the rest -of the git documentation.</p> +of the git documentation.</p></div> </div> -<h2>The git object database</h2> +<h2 id="_the_git_object_database">The git object database</h2> <div class="sectionbody"> -<p>Let's start a new project and create a small amount of history:</p> +<div class="para"><p>Let's start a new project and create a small amount of history:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ mkdir test-project @@ -300,22 +348,22 @@ $ git commit -a -m "add emphasis" Created commit c4d59f390b9cfd4318117afde11d601c1085f241</tt></pre> </div></div> -<p>What are the 40 digits of hex that git responded to the commit with?</p> -<p>We saw in part one of the tutorial that commits have names like this. +<div class="para"><p>What are the 40 digits of hex that git responded to the commit with?</p></div> +<div class="para"><p>We saw in part one of the tutorial that commits have names like this. It turns out that every object in the git history is stored under such a 40-digit hex name. That name is the SHA1 hash of the object's contents; among other things, this ensures that git will never store the same data twice (since identical data is given an identical SHA1 name), and that the contents of a git object will never change (since -that would change the object's name as well).</p> -<p>It is expected that the content of the commit object you created while +that would change the object's name as well).</p></div> +<div class="para"><p>It is expected that the content of the commit object you created while following the example above generates a different SHA1 hash than the one shown above because the commit object records the time when -it was created and the name of the person performing the commit.</p> -<p>We can ask git about this particular object with the <tt>cat-file</tt> +it was created and the name of the person performing the commit.</p></div> +<div class="para"><p>We can ask git about this particular object with the <tt>cat-file</tt> command. Don't copy the 40 hex digits from this example but use those from your own version. Note that you can shorten it to only a few -characters to save yourself typing all 40 hex digits:</p> +characters to save yourself typing all 40 hex digits:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git cat-file -t 54196cc2 @@ -327,34 +375,34 @@ initial commit</tt></pre> </div></div> -<p>A tree can refer to one or more "blob" objects, each corresponding to +<div class="para"><p>A tree can refer to one or more "blob" objects, each corresponding to a file. In addition, a tree can also refer to other tree objects, thus creating a directory hierarchy. You can examine the contents of any tree using ls-tree (remember that a long enough initial portion -of the SHA1 will also work):</p> +of the SHA1 will also work):</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git ls-tree 92b8b694 100644 blob 3b18e512dba79e4c8300dd08aeb37f8e728b8dad file.txt</tt></pre> </div></div> -<p>Thus we see that this tree has one file in it. The SHA1 hash is a -reference to that file's data:</p> +<div class="para"><p>Thus we see that this tree has one file in it. The SHA1 hash is a +reference to that file's data:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git cat-file -t 3b18e512 blob</tt></pre> </div></div> -<p>A "blob" is just file data, which we can also examine with cat-file:</p> +<div class="para"><p>A "blob" is just file data, which we can also examine with cat-file:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git cat-file blob 3b18e512 hello world</tt></pre> </div></div> -<p>Note that this is the old file data; so the object that git named in +<div class="para"><p>Note that this is the old file data; so the object that git named in its response to the initial tree was a tree with a snapshot of the -directory state that was recorded by the first commit.</p> -<p>All of these objects are stored under their SHA1 names inside the git -directory:</p> +directory state that was recorded by the first commit.</p></div> +<div class="para"><p>All of these objects are stored under their SHA1 names inside the git +directory:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ find .git/objects/ @@ -374,20 +422,20 @@ .git/objects/c4 .git/objects/c4/d59f390b9cfd4318117afde11d601c1085f241</tt></pre> </div></div> -<p>and the contents of these files is just the compressed data plus a +<div class="para"><p>and the contents of these files is just the compressed data plus a header identifying their length and their type. The type is either a -blob, a tree, a commit, or a tag.</p> -<p>The simplest commit to find is the HEAD commit, which we can find -from .git/HEAD:</p> +blob, a tree, a commit, or a tag.</p></div> +<div class="para"><p>The simplest commit to find is the HEAD commit, which we can find +from .git/HEAD:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ cat .git/HEAD ref: refs/heads/master</tt></pre> </div></div> -<p>As you can see, this tells us which branch we're currently on, and it +<div class="para"><p>As you can see, this tells us which branch we're currently on, and it tells us this by naming a file under the .git directory, which itself contains a SHA1 name referring to a commit object, which we can -examine with cat-file:</p> +examine with cat-file:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ cat .git/refs/heads/master @@ -402,7 +450,7 @@ add emphasis</tt></pre> </div></div> -<p>The "tree" object here refers to the new state of the tree:</p> +<div class="para"><p>The "tree" object here refers to the new state of the tree:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git ls-tree d0492b36 @@ -410,7 +458,7 @@ $ git cat-file blob a0423896 hello world!</tt></pre> </div></div> -<p>and the "parent" object refers to the previous commit:</p> +<div class="para"><p>and the "parent" object refers to the previous commit:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git cat-file commit 54196cc2 @@ -420,18 +468,18 @@ initial commit</tt></pre> </div></div> -<p>The tree object is the tree we examined first, and this commit is -unusual in that it lacks any parent.</p> -<p>Most commits have only one parent, but it is also common for a commit +<div class="para"><p>The tree object is the tree we examined first, and this commit is +unusual in that it lacks any parent.</p></div> +<div class="para"><p>Most commits have only one parent, but it is also common for a commit to have multiple parents. In that case the commit represents a merge, with the parent references pointing to the heads of the merged -branches.</p> -<p>Besides blobs, trees, and commits, the only remaining type of object +branches.</p></div> +<div class="para"><p>Besides blobs, trees, and commits, the only remaining type of object is a "tag", which we won't discuss here; refer to <a href="git-tag.html">git-tag(1)</a> -for details.</p> -<p>So now we know how git uses the object database to represent a -project's history:</p> -<ul> +for details.</p></div> +<div class="para"><p>So now we know how git uses the object database to represent a +project's history:</p></div> +<div class="ilist"><ul> <li> <p> "commit" objects refer to "tree" objects representing the @@ -463,31 +511,31 @@ The name of the current branch is stored in .git/HEAD. </p> </li> -</ul> -<p>Note, by the way, that lots of commands take a tree as an argument. +</ul></div> +<div class="para"><p>Note, by the way, that lots of commands take a tree as an argument. But as we can see above, a tree can be referred to in many different ways--by the SHA1 name for that tree, by the name of a commit that refers to the tree, by the name of a branch whose head refers to that -tree, etc.--and most such commands can accept any of these names.</p> -<p>In command synopses, the word "tree-ish" is sometimes used to -designate such an argument.</p> +tree, etc.--and most such commands can accept any of these names.</p></div> +<div class="para"><p>In command synopses, the word "tree-ish" is sometimes used to +designate such an argument.</p></div> </div> -<h2>The index file</h2> +<h2 id="_the_index_file">The index file</h2> <div class="sectionbody"> -<p>The primary tool we've been using to create commits is <tt>git-commit +<div class="para"><p>The primary tool we've been using to create commits is <tt>git-commit -a</tt>, which creates a commit including every change you've made to your working tree. But what if you want to commit changes only to -certain files? Or only certain changes to certain files?</p> -<p>If we look at the way commits are created under the cover, we'll see -that there are more flexible ways creating commits.</p> -<p>Continuing with our test-project, let's modify file.txt again:</p> +certain files? Or only certain changes to certain files?</p></div> +<div class="para"><p>If we look at the way commits are created under the cover, we'll see +that there are more flexible ways creating commits.</p></div> +<div class="para"><p>Continuing with our test-project, let's modify file.txt again:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ echo "hello world, again" >>file.txt</tt></pre> </div></div> -<p>but this time instead of immediately making the commit, let's take an +<div class="para"><p>but this time instead of immediately making the commit, let's take an intermediate step, and ask for diffs along the way to keep track of -what's happening:</p> +what's happening:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff @@ -499,8 +547,8 @@ $ git add file.txt $ git diff</tt></pre> </div></div> -<p>The last diff is empty, but no new commits have been made, and the -head still doesn't contain the new line:</p> +<div class="para"><p>The last diff is empty, but no new commits have been made, and the +head still doesn't contain the new line:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff HEAD @@ -512,10 +560,10 @@ hello world! +hello world, again</tt></pre> </div></div> -<p>So <tt>git-diff</tt> is comparing against something other than the head. +<div class="para"><p>So <em>git-diff</em> is comparing against something other than the head. The thing that it's comparing against is actually the index file, which is stored in .git/index in a binary format, but whose contents -we can examine with ls-files:</p> +we can examine with ls-files:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git ls-files --stage @@ -526,10 +574,10 @@ hello world! hello world, again</tt></pre> </div></div> -<p>So what our <tt>git-add</tt> did was store a new blob and then put +<div class="para"><p>So what our <em>git-add</em> did was store a new blob and then put a reference to it in the index file. If we modify the file again, -we'll see that the new modifications are reflected in the <tt>git-diff</tt> -output:</p> +we'll see that the new modifications are reflected in the <em>git-diff</em> +output:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ echo 'again?' >>file.txt @@ -542,9 +590,9 @@ hello world, again +again?</tt></pre> </div></div> -<p>With the right arguments, <tt>git-diff</tt> can also show us the difference +<div class="para"><p>With the right arguments, <em>git-diff</em> can also show us the difference between the working directory and the last commit, or between the -index and the last commit:</p> +index and the last commit:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff HEAD @@ -565,10 +613,10 @@ hello world! +hello world, again</tt></pre> </div></div> -<p>At any time, we can create a new commit using <tt>git-commit</tt> (without +<div class="para"><p>At any time, we can create a new commit using <em>git-commit</em> (without the "-a" option), and verify that the state committed only includes the changes stored in the index file, not the additional change that is -still only in our working tree:</p> +still only in our working tree:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git commit -m "repeat" @@ -582,32 +630,32 @@ hello world, again +again?</tt></pre> </div></div> -<p>So by default <tt>git-commit</tt> uses the index to create the commit, not +<div class="para"><p>So by default <em>git-commit</em> uses the index to create the commit, not the working tree; the "-a" option to commit tells it to first update -the index with all changes in the working tree.</p> -<p>Finally, it's worth looking at the effect of <tt>git-add</tt> on the index -file:</p> +the index with all changes in the working tree.</p></div> +<div class="para"><p>Finally, it's worth looking at the effect of <em>git-add</em> on the index +file:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ echo "goodbye, world" >closing.txt $ git add closing.txt</tt></pre> </div></div> -<p>The effect of the <tt>git-add</tt> was to add one entry to the index file:</p> +<div class="para"><p>The effect of the <em>git-add</em> was to add one entry to the index file:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git ls-files --stage 100644 8b9743b20d4b15be3955fc8d5cd2b09cd2336138 0 closing.txt 100644 513feba2e53ebbd2532419ded848ba19de88ba00 0 file.txt</tt></pre> </div></div> -<p>And, as you can see with cat-file, this new entry refers to the -current contents of the file:</p> +<div class="para"><p>And, as you can see with cat-file, this new entry refers to the +current contents of the file:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git cat-file blob 8b9743b2 goodbye, world</tt></pre> </div></div> -<p>The "status" command is a useful way to get a quick summary of the -situation:</p> +<div class="para"><p>The "status" command is a useful way to get a quick summary of the +situation:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git status @@ -623,54 +671,54 @@ # modified: file.txt #</tt></pre> </div></div> -<p>Since the current state of closing.txt is cached in the index file, +<div class="para"><p>Since the current state of closing.txt is cached in the index file, it is listed as "Changes to be committed". Since file.txt has changes in the working directory that aren't reflected in the index, it is marked "changed but not updated". At this point, running "git commit" would create a commit that added closing.txt (with its new -contents), but that didn't modify file.txt.</p> -<p>Also, note that a bare <tt>git diff</tt> shows the changes to file.txt, but +contents), but that didn't modify file.txt.</p></div> +<div class="para"><p>Also, note that a bare <tt>git diff</tt> shows the changes to file.txt, but not the addition of closing.txt, because the version of closing.txt -in the index file is identical to the one in the working directory.</p> -<p>In addition to being the staging area for new commits, the index file +in the index file is identical to the one in the working directory.</p></div> +<div class="para"><p>In addition to being the staging area for new commits, the index file is also populated from the object database when checking out a branch, and is used to hold the trees involved in a merge operation. See <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a> and the relevant man -pages for details.</p> +pages for details.</p></div> </div> -<h2>What next?</h2> +<h2 id="_what_next">What next?</h2> <div class="sectionbody"> -<p>At this point you should know everything necessary to read the man +<div class="para"><p>At this point you should know everything necessary to read the man pages for any of the git commands; one good place to start would be with the commands mentioned in <a href="everyday.html">Everyday git</a>. You -should be able to find any unknown jargon in <a href="gitglossary.html">gitglossary(7)</a>.</p> -<p>The <a href="user-manual.html">Git User's Manual</a> provides a more -comprehensive introduction to git.</p> -<p><a href="gitcvs-migration.html">gitcvs-migration(7)</a> explains how to +should be able to find any unknown jargon in <a href="gitglossary.html">gitglossary(7)</a>.</p></div> +<div class="para"><p>The <a href="user-manual.html">Git User's Manual</a> provides a more +comprehensive introduction to git.</p></div> +<div class="para"><p><a href="gitcvs-migration.html">gitcvs-migration(7)</a> explains how to import a CVS repository into git, and shows how to use git in a -CVS-like way.</p> -<p>For some interesting examples of git use, see the -<a href="howto-index.html">howtos</a>.</p> -<p>For git developers, <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a> goes +CVS-like way.</p></div> +<div class="para"><p>For some interesting examples of git use, see the +<a href="howto-index.html">howtos</a>.</p></div> +<div class="para"><p>For git developers, <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a> goes into detail on the lower-level git mechanisms involved in, for -example, creating a new commit.</p> +example, creating a new commit.</p></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="gittutorial.html">gittutorial(7)</a>, +<div class="para"><p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gitcvs-migration.html">gitcvs-migration(7)</a>, <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>, <a href="gitglossary.html">gitglossary(7)</a>, <a href="everyday.html">Everyday git</a>, -<a href="user-manual.html">The Git User's Manual</a></p> +<a href="user-manual.html">The Git User's Manual</a></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite.</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:11 UTC +Last updated 2008-07-06 05:17:11 UTC </div> </div> </body> diff --git a/gittutorial-2.txt b/gittutorial-2.txt index 6c93445..6609046 100644 --- a/gittutorial-2.txt +++ b/gittutorial-2.txt
@@ -255,7 +255,7 @@ +hello world, again ------------------------------------------------ -So `git-diff` is comparing against something other than the head. +So 'git-diff' is comparing against something other than the head. The thing that it's comparing against is actually the index file, which is stored in .git/index in a binary format, but whose contents we can examine with ls-files: @@ -270,9 +270,9 @@ hello world, again ------------------------------------------------ -So what our `git-add` did was store a new blob and then put +So what our 'git-add' did was store a new blob and then put a reference to it in the index file. If we modify the file again, -we'll see that the new modifications are reflected in the `git-diff` +we'll see that the new modifications are reflected in the 'git-diff' output: ------------------------------------------------ @@ -287,7 +287,7 @@ +again? ------------------------------------------------ -With the right arguments, `git-diff` can also show us the difference +With the right arguments, 'git-diff' can also show us the difference between the working directory and the last commit, or between the index and the last commit: @@ -311,7 +311,7 @@ +hello world, again ------------------------------------------------ -At any time, we can create a new commit using `git-commit` (without +At any time, we can create a new commit using 'git-commit' (without the "-a" option), and verify that the state committed only includes the changes stored in the index file, not the additional change that is still only in our working tree: @@ -329,11 +329,11 @@ +again? ------------------------------------------------ -So by default `git-commit` uses the index to create the commit, not +So by default 'git-commit' uses the index to create the commit, not the working tree; the "-a" option to commit tells it to first update the index with all changes in the working tree. -Finally, it's worth looking at the effect of `git-add` on the index +Finally, it's worth looking at the effect of 'git-add' on the index file: ------------------------------------------------ @@ -341,7 +341,7 @@ $ git add closing.txt ------------------------------------------------ -The effect of the `git-add` was to add one entry to the index file: +The effect of the 'git-add' was to add one entry to the index file: ------------------------------------------------ $ git ls-files --stage
diff --git a/gittutorial.html b/gittutorial.html index eddcf15..b77223e 100644 --- a/gittutorial.html +++ b/gittutorial.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>gittutorial(7)</title> </head> @@ -272,79 +320,79 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p>git *</p> +<div class="para"><p>git *</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This tutorial explains how to import a new project into git, make -changes to it, and share changes with other developers.</p> -<p>If you are instead primarily interested in using git to fetch a project, +<div class="para"><p>This tutorial explains how to import a new project into git, make +changes to it, and share changes with other developers.</p></div> +<div class="para"><p>If you are instead primarily interested in using git to fetch a project, for example, to test the latest version, you may prefer to start with -the first two chapters of <a href="user-manual.html">The Git User's Manual</a>.</p> -<p>First, note that you can get documentation for a command such as -<tt>git log --graph</tt> with:</p> +the first two chapters of <a href="user-manual.html">The Git User's Manual</a>.</p></div> +<div class="para"><p>First, note that you can get documentation for a command such as +<tt>git log --graph</tt> with:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ man git-log</tt></pre> </div></div> -<p>It is a good idea to introduce yourself to git with your name and +<div class="para"><p>It is a good idea to introduce yourself to git with your name and public email address before doing any operation. The easiest -way to do so is:</p> +way to do so is:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git config --global user.name "Your Name Comes Here" $ git config --global user.email you@yourdomain.example.com</tt></pre> </div></div> </div> -<h2>Importing a new project</h2> +<h2 id="_importing_a_new_project">Importing a new project</h2> <div class="sectionbody"> -<p>Assume you have a tarball project.tar.gz with your initial work. You -can place it under git revision control as follows.</p> +<div class="para"><p>Assume you have a tarball project.tar.gz with your initial work. You +can place it under git revision control as follows.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ tar xzf project.tar.gz $ cd project $ git init</tt></pre> </div></div> -<p>Git will reply</p> +<div class="para"><p>Git will reply</p></div> <div class="listingblock"> <div class="content"> <pre><tt>Initialized empty Git repository in .git/</tt></pre> </div></div> -<p>You've now initialized the working directory--you may notice a new -directory created, named ".git".</p> -<p>Next, tell git to take a snapshot of the contents of all files under the -current directory (note the <em>.</em>), with <tt>git-add</tt>:</p> +<div class="para"><p>You've now initialized the working directory--you may notice a new +directory created, named ".git".</p></div> +<div class="para"><p>Next, tell git to take a snapshot of the contents of all files under the +current directory (note the <em>.</em>), with <em>git-add</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git add .</tt></pre> </div></div> -<p>This snapshot is now stored in a temporary staging area which git calls +<div class="para"><p>This snapshot is now stored in a temporary staging area which git calls the "index". You can permanently store the contents of the index in the -repository with <tt>git-commit</tt>:</p> +repository with <em>git-commit</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git commit</tt></pre> </div></div> -<p>This will prompt you for a commit message. You've now stored the first -version of your project in git.</p> +<div class="para"><p>This will prompt you for a commit message. You've now stored the first +version of your project in git.</p></div> </div> -<h2>Making changes</h2> +<h2 id="_making_changes">Making changes</h2> <div class="sectionbody"> -<p>Modify some files, then add their updated contents to the index:</p> +<div class="para"><p>Modify some files, then add their updated contents to the index:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git add file1 file2 file3</tt></pre> </div></div> -<p>You are now ready to commit. You can see what is about to be committed -using <tt>git-diff</tt> with the --cached option:</p> +<div class="para"><p>You are now ready to commit. You can see what is about to be committed +using <em>git-diff</em> with the --cached option:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff --cached</tt></pre> </div></div> -<p>(Without --cached, <tt>git-diff</tt> will show you any changes that +<div class="para"><p>(Without --cached, <em>git-diff</em> will show you any changes that you've made but not yet added to the index.) You can also get a brief -summary of the situation with <tt>git-status</tt>:</p> +summary of the situation with <em>git-status</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git status @@ -357,254 +405,254 @@ # modified: file3 #</tt></pre> </div></div> -<p>If you need to make any further adjustments, do so now, and then add any -newly modified content to the index. Finally, commit your changes with:</p> +<div class="para"><p>If you need to make any further adjustments, do so now, and then add any +newly modified content to the index. Finally, commit your changes with:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git commit</tt></pre> </div></div> -<p>This will again prompt you for a message describing the change, and then -record a new version of the project.</p> -<p>Alternatively, instead of running <tt>git-add</tt> beforehand, you can use</p> +<div class="para"><p>This will again prompt you for a message describing the change, and then +record a new version of the project.</p></div> +<div class="para"><p>Alternatively, instead of running <em>git-add</em> beforehand, you can use</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git commit -a</tt></pre> </div></div> -<p>which will automatically notice any modified (but not new) files, add -them to the index, and commit, all in one step.</p> -<p>A note on commit messages: Though not required, it's a good idea to +<div class="para"><p>which will automatically notice any modified (but not new) files, add +them to the index, and commit, all in one step.</p></div> +<div class="para"><p>A note on commit messages: Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. Tools that turn commits into email, for example, use the first line on the Subject: line and the rest of the -commit in the body.</p> +commit in the body.</p></div> </div> -<h2>Git tracks content not files</h2> +<h2 id="_git_tracks_content_not_files">Git tracks content not files</h2> <div class="sectionbody"> -<p>Many revision control systems provide an <tt>add</tt> command that tells the +<div class="para"><p>Many revision control systems provide an <tt>add</tt> command that tells the system to start tracking changes to a new file. Git's <tt>add</tt> command -does something simpler and more powerful: <tt>git-add</tt> is used both for new +does something simpler and more powerful: <em>git-add</em> is used both for new and newly modified files, and in both cases it takes a snapshot of the given files and stages that content in the index, ready for inclusion in -the next commit.</p> +the next commit.</p></div> </div> -<h2>Viewing project history</h2> +<h2 id="_viewing_project_history">Viewing project history</h2> <div class="sectionbody"> -<p>At any point you can view the history of your changes using</p> +<div class="para"><p>At any point you can view the history of your changes using</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log</tt></pre> </div></div> -<p>If you also want to see complete diffs at each step, use</p> +<div class="para"><p>If you also want to see complete diffs at each step, use</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log -p</tt></pre> </div></div> -<p>Often the overview of the change is useful to get a feel of -each step</p> +<div class="para"><p>Often the overview of the change is useful to get a feel of +each step</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log --stat --summary</tt></pre> </div></div> </div> -<h2>Managing branches</h2> +<h2 id="_managing_branches">Managing branches</h2> <div class="sectionbody"> -<p>A single git repository can maintain multiple branches of -development. To create a new branch named "experimental", use</p> +<div class="para"><p>A single git repository can maintain multiple branches of +development. To create a new branch named "experimental", use</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git branch experimental</tt></pre> </div></div> -<p>If you now run</p> +<div class="para"><p>If you now run</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git branch</tt></pre> </div></div> -<p>you'll get a list of all existing branches:</p> +<div class="para"><p>you'll get a list of all existing branches:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> experimental * master</tt></pre> </div></div> -<p>The "experimental" branch is the one you just created, and the +<div class="para"><p>The "experimental" branch is the one you just created, and the "master" branch is a default branch that was created for you automatically. The asterisk marks the branch you are currently on; -type</p> +type</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout experimental</tt></pre> </div></div> -<p>to switch to the experimental branch. Now edit a file, commit the -change, and switch back to the master branch:</p> +<div class="para"><p>to switch to the experimental branch. Now edit a file, commit the +change, and switch back to the master branch:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>(edit file) $ git commit -a $ git checkout master</tt></pre> </div></div> -<p>Check that the change you made is no longer visible, since it was -made on the experimental branch and you're back on the master branch.</p> -<p>You can make a different change on the master branch:</p> +<div class="para"><p>Check that the change you made is no longer visible, since it was +made on the experimental branch and you're back on the master branch.</p></div> +<div class="para"><p>You can make a different change on the master branch:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>(edit file) $ git commit -a</tt></pre> </div></div> -<p>at this point the two branches have diverged, with different changes -made in each. To merge the changes made in experimental into master, run</p> +<div class="para"><p>at this point the two branches have diverged, with different changes +made in each. To merge the changes made in experimental into master, run</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git merge experimental</tt></pre> </div></div> -<p>If the changes don't conflict, you're done. If there are conflicts, -markers will be left in the problematic files showing the conflict;</p> +<div class="para"><p>If the changes don't conflict, you're done. If there are conflicts, +markers will be left in the problematic files showing the conflict;</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff</tt></pre> </div></div> -<p>will show this. Once you've edited the files to resolve the -conflicts,</p> +<div class="para"><p>will show this. Once you've edited the files to resolve the +conflicts,</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git commit -a</tt></pre> </div></div> -<p>will commit the result of the merge. Finally,</p> +<div class="para"><p>will commit the result of the merge. Finally,</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ gitk</tt></pre> </div></div> -<p>will show a nice graphical representation of the resulting history.</p> -<p>At this point you could delete the experimental branch with</p> +<div class="para"><p>will show a nice graphical representation of the resulting history.</p></div> +<div class="para"><p>At this point you could delete the experimental branch with</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git branch -d experimental</tt></pre> </div></div> -<p>This command ensures that the changes in the experimental branch are -already in the current branch.</p> -<p>If you develop on a branch crazy-idea, then regret it, you can always -delete the branch with</p> +<div class="para"><p>This command ensures that the changes in the experimental branch are +already in the current branch.</p></div> +<div class="para"><p>If you develop on a branch crazy-idea, then regret it, you can always +delete the branch with</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git branch -D crazy-idea</tt></pre> </div></div> -<p>Branches are cheap and easy, so this is a good way to try something -out.</p> +<div class="para"><p>Branches are cheap and easy, so this is a good way to try something +out.</p></div> </div> -<h2>Using git for collaboration</h2> +<h2 id="_using_git_for_collaboration">Using git for collaboration</h2> <div class="sectionbody"> -<p>Suppose that Alice has started a new project with a git repository in +<div class="para"><p>Suppose that Alice has started a new project with a git repository in /home/alice/project, and that Bob, who has a home directory on the -same machine, wants to contribute.</p> -<p>Bob begins with:</p> +same machine, wants to contribute.</p></div> +<div class="para"><p>Bob begins with:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git clone /home/alice/project myrepo</tt></pre> </div></div> -<p>This creates a new directory "myrepo" containing a clone of Alice's +<div class="para"><p>This creates a new directory "myrepo" containing a clone of Alice's repository. The clone is on an equal footing with the original -project, possessing its own copy of the original project's history.</p> -<p>Bob then makes some changes and commits them:</p> +project, possessing its own copy of the original project's history.</p></div> +<div class="para"><p>Bob then makes some changes and commits them:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>(edit files) $ git commit -a (repeat as necessary)</tt></pre> </div></div> -<p>When he's ready, he tells Alice to pull changes from the repository -at /home/bob/myrepo. She does this with:</p> +<div class="para"><p>When he's ready, he tells Alice to pull changes from the repository +at /home/bob/myrepo. She does this with:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ cd /home/alice/project $ git pull /home/bob/myrepo master</tt></pre> </div></div> -<p>This merges the changes from Bob's "master" branch into Alice's +<div class="para"><p>This merges the changes from Bob's "master" branch into Alice's current branch. If Alice has made her own changes in the meantime, then she may need to manually fix any conflicts. (Note that the "master" argument in the above command is actually unnecessary, as it -is the default.)</p> -<p>The "pull" command thus performs two operations: it fetches changes -from a remote branch, then merges them into the current branch.</p> -<p>When you are working in a small closely knit group, it is not +is the default.)</p></div> +<div class="para"><p>The "pull" command thus performs two operations: it fetches changes +from a remote branch, then merges them into the current branch.</p></div> +<div class="para"><p>When you are working in a small closely knit group, it is not unusual to interact with the same repository over and over again. By defining <em>remote</em> repository shorthand, you can make -it easier:</p> +it easier:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git remote add bob /home/bob/myrepo</tt></pre> </div></div> -<p>With this, Alice can perform the first operation alone using the -<tt>git-fetch</tt> command without merging them with her own branch, -using:</p> +<div class="para"><p>With this, Alice can perform the first operation alone using the +<em>git-fetch</em> command without merging them with her own branch, +using:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git fetch bob</tt></pre> </div></div> -<p>Unlike the longhand form, when Alice fetches from Bob using a -remote repository shorthand set up with <tt>git-remote</tt>, what was +<div class="para"><p>Unlike the longhand form, when Alice fetches from Bob using a +remote repository shorthand set up with <em>git-remote</em>, what was fetched is stored in a remote tracking branch, in this case -<tt>bob/master</tt>. So after this:</p> +<tt>bob/master</tt>. So after this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log -p master..bob/master</tt></pre> </div></div> -<p>shows a list of all the changes that Bob made since he branched from -Alice's master branch.</p> -<p>After examining those changes, Alice -could merge the changes into her master branch:</p> +<div class="para"><p>shows a list of all the changes that Bob made since he branched from +Alice's master branch.</p></div> +<div class="para"><p>After examining those changes, Alice +could merge the changes into her master branch:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git merge bob/master</tt></pre> </div></div> -<p>This <tt>merge</tt> can also be done by <em>pulling from her own remote -tracking branch</em>, like this:</p> +<div class="para"><p>This <tt>merge</tt> can also be done by <em>pulling from her own remote +tracking branch</em>, like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git pull . remotes/bob/master</tt></pre> </div></div> -<p>Note that git pull always merges into the current branch, -regardless of what else is given on the command line.</p> -<p>Later, Bob can update his repo with Alice's latest changes using</p> +<div class="para"><p>Note that git pull always merges into the current branch, +regardless of what else is given on the command line.</p></div> +<div class="para"><p>Later, Bob can update his repo with Alice's latest changes using</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git pull</tt></pre> </div></div> -<p>Note that he doesn't need to give the path to Alice's repository; +<div class="para"><p>Note that he doesn't need to give the path to Alice's repository; when Bob cloned Alice's repository, git stored the location of her repository in the repository configuration, and that location is -used for pulls:</p> +used for pulls:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git config --get remote.origin.url /home/alice/project</tt></pre> </div></div> -<p>(The complete configuration created by <tt>git-clone</tt> is visible using +<div class="para"><p>(The complete configuration created by <em>git-clone</em> is visible using <tt>git config -l</tt>, and the <a href="git-config.html">git-config(1)</a> man page -explains the meaning of each option.)</p> -<p>Git also keeps a pristine copy of Alice's master branch under the -name "origin/master":</p> +explains the meaning of each option.)</p></div> +<div class="para"><p>Git also keeps a pristine copy of Alice's master branch under the +name "origin/master":</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git branch -r origin/master</tt></pre> </div></div> -<p>If Bob later decides to work from a different host, he can still -perform clones and pulls using the ssh protocol:</p> +<div class="para"><p>If Bob later decides to work from a different host, he can still +perform clones and pulls using the ssh protocol:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git clone alice.org:/home/alice/project myrepo</tt></pre> </div></div> -<p>Alternatively, git has a native protocol, or can use rsync or http; -see <a href="git-pull.html">git-pull(1)</a> for details.</p> -<p>Git can also be used in a CVS-like mode, with a central repository +<div class="para"><p>Alternatively, git has a native protocol, or can use rsync or http; +see <a href="git-pull.html">git-pull(1)</a> for details.</p></div> +<div class="para"><p>Git can also be used in a CVS-like mode, with a central repository that various users push changes to; see <a href="git-push.html">git-push(1)</a> and -<a href="gitcvs-migration.html">gitcvs-migration(7)</a>.</p> +<a href="gitcvs-migration.html">gitcvs-migration(7)</a>.</p></div> </div> -<h2>Exploring history</h2> +<h2 id="_exploring_history">Exploring history</h2> <div class="sectionbody"> -<p>Git history is represented as a series of interrelated commits. We -have already seen that the <tt>git-log</tt> command can list those commits. +<div class="para"><p>Git history is represented as a series of interrelated commits. We +have already seen that the <em>git-log</em> command can list those commits. Note that first line of each git log entry also gives a name for the -commit:</p> +commit:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log @@ -614,14 +662,14 @@ merge-base: Clarify the comments on post processing.</tt></pre> </div></div> -<p>We can give this name to <tt>git-show</tt> to see the details about this -commit.</p> +<div class="para"><p>We can give this name to <em>git-show</em> to see the details about this +commit.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show c82a22c39cbc32576f64f5c6b3f24b99ea8149c7</tt></pre> </div></div> -<p>But there are other ways to refer to commits. You can use any initial -part of the name that is long enough to uniquely identify the commit:</p> +<div class="para"><p>But there are other ways to refer to commits. You can use any initial +part of the name that is long enough to uniquely identify the commit:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show c82a22c39c # the first few characters of the name are @@ -629,31 +677,31 @@ $ git show HEAD # the tip of the current branch $ git show experimental # the tip of the "experimental" branch</tt></pre> </div></div> -<p>Every commit usually has one "parent" commit -which points to the previous state of the project:</p> +<div class="para"><p>Every commit usually has one "parent" commit +which points to the previous state of the project:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show HEAD^ # to see the parent of HEAD $ git show HEAD^^ # to see the grandparent of HEAD $ git show HEAD~4 # to see the great-great grandparent of HEAD</tt></pre> </div></div> -<p>Note that merge commits may have more than one parent:</p> +<div class="para"><p>Note that merge commits may have more than one parent:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show HEAD^1 # show the first parent of HEAD (same as HEAD^) $ git show HEAD^2 # show the second parent of HEAD</tt></pre> </div></div> -<p>You can also give commits names of your own; after running</p> +<div class="para"><p>You can also give commits names of your own; after running</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git tag v2.5 1b2e1d63ff</tt></pre> </div></div> -<p>you can refer to 1b2e1d63ff by the name "v2.5". If you intend to +<div class="para"><p>you can refer to 1b2e1d63ff by the name "v2.5". If you intend to share this name with other people (for example, to identify a release version), you should create a "tag" object, and perhaps sign it; see -<a href="git-tag.html">git-tag(1)</a> for details.</p> -<p>Any git command that needs to know a commit can take any of these -names. For example:</p> +<a href="git-tag.html">git-tag(1)</a> for details.</p></div> +<div class="para"><p>Any git command that needs to know a commit can take any of these +names. For example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff v2.5 HEAD # compare the current HEAD to v2.5 @@ -662,30 +710,30 @@ $ git reset --hard HEAD^ # reset your current branch and working # directory to its state at HEAD^</tt></pre> </div></div> -<p>Be careful with that last command: in addition to losing any changes +<div class="para"><p>Be careful with that last command: in addition to losing any changes in the working directory, it will also remove all later commits from this branch. If this branch is the only branch containing those -commits, they will be lost. Also, don't use <tt>git-reset</tt> on a +commits, they will be lost. Also, don't use <em>git-reset</em> on a publicly-visible branch that other developers pull from, as it will force needless merges on other developers to clean up the history. -If you need to undo changes that you have pushed, use <tt>git-revert</tt> -instead.</p> -<p>The <tt>git-grep</tt> command can search for strings in any version of your -project, so</p> +If you need to undo changes that you have pushed, use <em>git-revert</em> +instead.</p></div> +<div class="para"><p>The <em>git-grep</em> command can search for strings in any version of your +project, so</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git grep "hello" v2.5</tt></pre> </div></div> -<p>searches for all occurrences of "hello" in v2.5.</p> -<p>If you leave out the commit name, <tt>git-grep</tt> will search any of the -files it manages in your current directory. So</p> +<div class="para"><p>searches for all occurrences of "hello" in v2.5.</p></div> +<div class="para"><p>If you leave out the commit name, <em>git-grep</em> will search any of the +files it manages in your current directory. So</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git grep "hello"</tt></pre> </div></div> -<p>is a quick way to search just the files that are tracked by git.</p> -<p>Many git commands also take sets of commits, which can be specified -in a number of ways. Here are some examples with <tt>git-log</tt>:</p> +<div class="para"><p>is a quick way to search just the files that are tracked by git.</p></div> +<div class="para"><p>Many git commands also take sets of commits, which can be specified +in a number of ways. Here are some examples with <em>git-log</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log v2.5..v2.6 # commits between v2.5 and v2.6 @@ -694,57 +742,57 @@ $ git log v2.5.. Makefile # commits since v2.5 which modify # Makefile</tt></pre> </div></div> -<p>You can also give <tt>git-log</tt> a "range" of commits where the first is not +<div class="para"><p>You can also give <em>git-log</em> a "range" of commits where the first is not necessarily an ancestor of the second; for example, if the tips of the branches "stable-release" and "master" diverged from a common -commit some time ago, then</p> +commit some time ago, then</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log stable..experimental</tt></pre> </div></div> -<p>will list commits made in the experimental branch but not in the -stable branch, while</p> +<div class="para"><p>will list commits made in the experimental branch but not in the +stable branch, while</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log experimental..stable</tt></pre> </div></div> -<p>will show the list of commits made on the stable branch but not -the experimental branch.</p> -<p>The <tt>git-log</tt> command has a weakness: it must present commits in a +<div class="para"><p>will show the list of commits made on the stable branch but not +the experimental branch.</p></div> +<div class="para"><p>The <em>git-log</em> command has a weakness: it must present commits in a list. When the history has lines of development that diverged and -then merged back together, the order in which <tt>git-log</tt> presents -those commits is meaningless.</p> -<p>Most projects with multiple contributors (such as the linux kernel, -or git itself) have frequent merges, and <tt>gitk</tt> does a better job of -visualizing their history. For example,</p> +then merged back together, the order in which <em>git-log</em> presents +those commits is meaningless.</p></div> +<div class="para"><p>Most projects with multiple contributors (such as the linux kernel, +or git itself) have frequent merges, and <em>gitk</em> does a better job of +visualizing their history. For example,</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ gitk --since="2 weeks ago" drivers/</tt></pre> </div></div> -<p>allows you to browse any commits from the last 2 weeks of commits +<div class="para"><p>allows you to browse any commits from the last 2 weeks of commits that modified files under the "drivers" directory. (Note: you can adjust gitk's fonts by holding down the control key while pressing -"-" or "+".)</p> -<p>Finally, most commands that take filenames will optionally allow you +"-" or "+".)</p></div> +<div class="para"><p>Finally, most commands that take filenames will optionally allow you to precede any filename by a commit, to specify a particular version -of the file:</p> +of the file:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff v2.5:Makefile HEAD:Makefile.in</tt></pre> </div></div> -<p>You can also use <tt>git-show</tt> to see any such file:</p> +<div class="para"><p>You can also use <em>git-show</em> to see any such file:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show v2.5:Makefile</tt></pre> </div></div> </div> -<h2>Next Steps</h2> +<h2 id="_next_steps">Next Steps</h2> <div class="sectionbody"> -<p>This tutorial should be enough to perform basic distributed revision +<div class="para"><p>This tutorial should be enough to perform basic distributed revision control for your projects. However, to fully understand the depth and power of git you need to understand two simple ideas on which it -is based:</p> -<ul> +is based:</p></div> +<div class="ilist"><ul> <li> <p> The object database is the rather elegant system used to @@ -759,13 +807,13 @@ hold the various trees involved in a merge. </p> </li> -</ul> -<p>Part two of this tutorial explains the object +</ul></div> +<div class="para"><p>Part two of this tutorial explains the object database, the index file, and a few other odds and ends that you'll -need to make the most of git. You can find it at <a href="gittutorial-2.html">gittutorial-2(7)</a>.</p> -<p>If you don't want to continue with that right away, a few other -digressions that may be interesting at this point are:</p> -<ul> +need to make the most of git. You can find it at <a href="gittutorial-2.html">gittutorial-2(7)</a>.</p></div> +<div class="para"><p>If you don't want to continue with that right away, a few other +digressions that may be interesting at this point are:</p></div> +<div class="ilist"><ul> <li> <p> <a href="git-format-patch.html">git-format-patch(1)</a>, <a href="git-am.html">git-am(1)</a>: These convert @@ -794,24 +842,24 @@ <a href="gitcvs-migration.html">gitcvs-migration(7)</a>: Git for CVS users. </p> </li> -</ul> +</ul></div> </div> -<h2>SEE ALSO</h2> +<h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<p><a href="gittutorial-2.html">gittutorial-2(7)</a>, +<div class="para"><p><a href="gittutorial-2.html">gittutorial-2(7)</a>, <a href="gitcvs-migration.html">gitcvs-migration(7)</a>, <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>, <a href="gitglossary.html">gitglossary(7)</a>, <a href="everyday.html">Everyday git</a>, -<a href="user-manual.html">The Git User's Manual</a></p> +<a href="user-manual.html">The Git User's Manual</a></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite.</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:11 UTC +Last updated 2008-07-06 05:17:11 UTC </div> </div> </body> diff --git a/gittutorial.txt b/gittutorial.txt index 036a27c..e71b561 100644 --- a/gittutorial.txt +++ b/gittutorial.txt
@@ -58,7 +58,7 @@ directory created, named ".git". Next, tell git to take a snapshot of the contents of all files under the -current directory (note the '.'), with `git-add`: +current directory (note the '.'), with 'git-add': ------------------------------------------------ $ git add . @@ -66,7 +66,7 @@ This snapshot is now stored in a temporary staging area which git calls the "index". You can permanently store the contents of the index in the -repository with `git-commit`: +repository with 'git-commit': ------------------------------------------------ $ git commit @@ -85,15 +85,15 @@ ------------------------------------------------ You are now ready to commit. You can see what is about to be committed -using `git-diff` with the --cached option: +using 'git-diff' with the --cached option: ------------------------------------------------ $ git diff --cached ------------------------------------------------ -(Without --cached, `git-diff` will show you any changes that +(Without --cached, 'git-diff' will show you any changes that you've made but not yet added to the index.) You can also get a brief -summary of the situation with `git-status`: +summary of the situation with 'git-status': ------------------------------------------------ $ git status @@ -117,7 +117,7 @@ This will again prompt you for a message describing the change, and then record a new version of the project. -Alternatively, instead of running `git-add` beforehand, you can use +Alternatively, instead of running 'git-add' beforehand, you can use ------------------------------------------------ $ git commit -a @@ -138,7 +138,7 @@ Many revision control systems provide an `add` command that tells the system to start tracking changes to a new file. Git's `add` command -does something simpler and more powerful: `git-add` is used both for new +does something simpler and more powerful: 'git-add' is used both for new and newly modified files, and in both cases it takes a snapshot of the given files and stages that content in the index, ready for inclusion in the next commit. @@ -316,7 +316,7 @@ ------------------------------------------------ With this, Alice can perform the first operation alone using the -`git-fetch` command without merging them with her own branch, +'git-fetch' command without merging them with her own branch, using: ------------------------------------- @@ -324,7 +324,7 @@ ------------------------------------- Unlike the longhand form, when Alice fetches from Bob using a -remote repository shorthand set up with `git-remote`, what was +remote repository shorthand set up with 'git-remote', what was fetched is stored in a remote tracking branch, in this case `bob/master`. So after this: @@ -368,7 +368,7 @@ /home/alice/project ------------------------------------- -(The complete configuration created by `git-clone` is visible using +(The complete configuration created by 'git-clone' is visible using `git config -l`, and the linkgit:git-config[1] man page explains the meaning of each option.) @@ -398,7 +398,7 @@ ----------------- Git history is represented as a series of interrelated commits. We -have already seen that the `git-log` command can list those commits. +have already seen that the 'git-log' command can list those commits. Note that first line of each git log entry also gives a name for the commit: @@ -411,7 +411,7 @@ merge-base: Clarify the comments on post processing. ------------------------------------- -We can give this name to `git-show` to see the details about this +We can give this name to 'git-show' to see the details about this commit. ------------------------------------- @@ -469,13 +469,13 @@ Be careful with that last command: in addition to losing any changes in the working directory, it will also remove all later commits from this branch. If this branch is the only branch containing those -commits, they will be lost. Also, don't use `git-reset` on a +commits, they will be lost. Also, don't use 'git-reset' on a publicly-visible branch that other developers pull from, as it will force needless merges on other developers to clean up the history. -If you need to undo changes that you have pushed, use `git-revert` +If you need to undo changes that you have pushed, use 'git-revert' instead. -The `git-grep` command can search for strings in any version of your +The 'git-grep' command can search for strings in any version of your project, so ------------------------------------- @@ -484,7 +484,7 @@ searches for all occurrences of "hello" in v2.5. -If you leave out the commit name, `git-grep` will search any of the +If you leave out the commit name, 'git-grep' will search any of the files it manages in your current directory. So ------------------------------------- @@ -494,7 +494,7 @@ is a quick way to search just the files that are tracked by git. Many git commands also take sets of commits, which can be specified -in a number of ways. Here are some examples with `git-log`: +in a number of ways. Here are some examples with 'git-log': ------------------------------------- $ git log v2.5..v2.6 # commits between v2.5 and v2.6 @@ -504,7 +504,7 @@ # Makefile ------------------------------------- -You can also give `git-log` a "range" of commits where the first is not +You can also give 'git-log' a "range" of commits where the first is not necessarily an ancestor of the second; for example, if the tips of the branches "stable-release" and "master" diverged from a common commit some time ago, then @@ -523,13 +523,13 @@ will show the list of commits made on the stable branch but not the experimental branch. -The `git-log` command has a weakness: it must present commits in a +The 'git-log' command has a weakness: it must present commits in a list. When the history has lines of development that diverged and -then merged back together, the order in which `git-log` presents +then merged back together, the order in which 'git-log' presents those commits is meaningless. Most projects with multiple contributors (such as the linux kernel, -or git itself) have frequent merges, and `gitk` does a better job of +or git itself) have frequent merges, and 'gitk' does a better job of visualizing their history. For example, ------------------------------------- @@ -549,7 +549,7 @@ $ git diff v2.5:Makefile HEAD:Makefile.in ------------------------------------- -You can also use `git-show` to see any such file: +You can also use 'git-show' to see any such file: ------------------------------------- $ git show v2.5:Makefile
diff --git a/i18n.txt b/i18n.txt index 1e188e6..fb0d7da 100644 --- a/i18n.txt +++ b/i18n.txt
@@ -21,7 +21,7 @@ does not forbid it. However, there are a few things to keep in mind. -. `git-commit-tree` (hence, `git-commit` which uses it) issues +. 'git-commit-tree' (hence, 'git-commit' which uses it) issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to @@ -37,7 +37,7 @@ help other people who look at them later. Lack of this header implies that the commit log message is encoded in UTF-8. -. `git-log`, `git-show` and friends looks at the `encoding` +. 'git-log', 'git-show' and friends looks at the `encoding` header of a commit object, and tries to re-code the log message into UTF-8 unless otherwise specified. You can specify the desired output encoding with
diff --git a/merge-options.txt b/merge-options.txt index ffbc6e9..007909a 100644 --- a/merge-options.txt +++ b/merge-options.txt
@@ -56,5 +56,5 @@ Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies - is used instead (`git-merge-recursive` when merging a single - head, `git-merge-octopus` otherwise). + is used instead ('git-merge-recursive' when merging a single + head, 'git-merge-octopus' otherwise). diff --git a/pretty-formats.txt b/pretty-formats.txt index ec37555..69e6d2f 100644 --- a/pretty-formats.txt +++ b/pretty-formats.txt
@@ -30,7 +30,7 @@ commit <sha1> Author: <author> - Date: <date> + Date: <author date> <title line> @@ -50,9 +50,9 @@ commit <sha1> Author: <author> - AuthorDate: <date & time> + AuthorDate: <author date> Commit: <committer> - CommitDate: <date & time> + CommitDate: <committer date> <title line> @@ -62,7 +62,7 @@ From <sha1> <date> From: <author> - Date: <date & time> + Date: <author date> Subject: [PATCH] <title line> <full commit message>
diff --git a/pull-fetch-param.txt b/pull-fetch-param.txt index cbee369..00a8d21 100644 --- a/pull-fetch-param.txt +++ b/pull-fetch-param.txt
@@ -32,7 +32,7 @@ [NOTE] You never do your own development on branches that appear on the right hand side of a <refspec> colon on `Pull:` lines; -they are to be updated by `git-fetch`. If you intend to do +they are to be updated by 'git-fetch'. If you intend to do development derived from a remote branch `B`, have a `Pull:` line to track it (i.e. `Pull: B:remote-B`), and have a separate branch `my-B` to do your development on top of it. The latter @@ -44,13 +44,13 @@ + [NOTE] There is a difference between listing multiple <refspec> -directly on `git-pull` command line and having multiple +directly on 'git-pull' command line and having multiple `Pull:` <refspec> lines for a <repository> and running -`git-pull` command without any explicit <refspec> parameters. +'git-pull' command without any explicit <refspec> parameters. <refspec> listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote refs, you would be making -an Octopus. While `git-pull` run without any explicit <refspec> +an Octopus. While 'git-pull' run without any explicit <refspec> parameter takes default <refspec>s from `Pull:` lines, it merges only the first <refspec> found into the current branch, after fetching all the remote refs. This is because making an
diff --git a/urls-remotes.txt b/urls-remotes.txt index 9975300..504ae8a 100644 --- a/urls-remotes.txt +++ b/urls-remotes.txt
@@ -49,8 +49,8 @@ ------------ -`Push:` lines are used by `git-push` and -`Pull:` lines are used by `git-pull` and `git-fetch`. +`Push:` lines are used by 'git-push' and +`Pull:` lines are used by 'git-pull' and 'git-fetch'. Multiple `Push:` and `Pull:` lines may be specified for additional branch mappings.
diff --git a/user-manual.html b/user-manual.html index 3c8d094..974ed6e 100644 --- a/user-manual.html +++ b/user-manual.html
@@ -1,13 +1,13 @@ -<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User's Manual (for version 1.5.3 or newer)</title><link rel="stylesheet" href="docbook-xsl.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.69.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id189136"></a>Git User's Manual (for version 1.5.3 or newer)</h1></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="preface"><a href="#id264725">Preface</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-with-git-fetch">Updating a repository with git-fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-comments-with-given-content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-with-git">3. Developing with git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-with-git-pull">Getting updates with git-pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a git repository via the git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via http</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git-rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-with-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git-fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#id280263">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory -> index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index -> object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database -> index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index -> working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git's source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. GIT Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><div class="preface" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="id264725"></a>Preface</h2></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX -command-line skills, but no previous knowledge of git.</p><p><a href="#repositories-and-branches" title="Chapter 1. Repositories and Branches">Chapter 1, <i>Repositories and Branches</i></a> and <a href="#exploring-git-history" title="Chapter 2. Exploring git history">Chapter 2, <i>Exploring git history</i></a> explain how +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User's Manual (for version 1.5.3 or newer)</title><link rel="stylesheet" href="docbook-xsl.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id450364"></a>Git User's Manual (for version 1.5.3 or newer)</h1></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="preface"><a href="#id482845">Preface</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-with-git-fetch">Updating a repository with git-fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-comments-with-given-content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-with-git">3. Developing with git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-with-git-pull">Getting updates with git-pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a git repository via the git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via http</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git-rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-with-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git-fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory -> index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index -> object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database -> index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index -> working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git's source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. GIT Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><div class="preface" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="id482845"></a>Preface</h2></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX +command-line skills, but no previous knowledge of git.</p><p><a class="xref" href="#repositories-and-branches" title="Chapter 1. Repositories and Branches">Chapter 1, <i>Repositories and Branches</i></a> and <a class="xref" href="#exploring-git-history" title="Chapter 2. Exploring git history">Chapter 2, <i>Exploring git history</i></a> explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for regressions, and so on.</p><p>People needing to do actual development will also want to read -<a href="#Developing-with-git" title="Chapter 3. Developing with git">Chapter 3, <i>Developing with git</i></a> and <a href="#sharing-development" title="Chapter 4. Sharing development with others">Chapter 4, <i>Sharing development with others</i></a>.</p><p>Further chapters cover more specialized topics.</p><p>Comprehensive reference documentation is available through the man -pages. For a command such as "git clone <repo>", just use</p><div class="literallayout"><p>$ man git-clone</p></div><p>See also <a href="#git-quick-start" title="Appendix A. Git Quick Reference">Appendix A, <i>Git Quick Reference</i></a> for a brief overview of git commands, -without any explanation.</p><p>Finally, see <a href="#todo" title="Appendix B. Notes and todo list for this manual">Appendix B, <i>Notes and todo list for this manual</i></a> for ways that you can help make this manual more +<a class="xref" href="#Developing-with-git" title="Chapter 3. Developing with git">Chapter 3, <i>Developing with git</i></a> and <a class="xref" href="#sharing-development" title="Chapter 4. Sharing development with others">Chapter 4, <i>Sharing development with others</i></a>.</p><p>Further chapters cover more specialized topics.</p><p>Comprehensive reference documentation is available through the man +pages. For a command such as "git clone <repo>", just use</p><div class="literallayout"><p>$ man git-clone</p></div><p>See also <a class="xref" href="#git-quick-start" title="Appendix A. Git Quick Reference">Appendix A, <i>Git Quick Reference</i></a> for a brief overview of git commands, +without any explanation.</p><p>Finally, see <a class="xref" href="#todo" title="Appendix B. Notes and todo list for this manual">Appendix B, <i>Notes and todo list for this manual</i></a> for ways that you can help make this manual more complete.</p></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="repositories-and-branches"></a>Chapter 1. Repositories and Branches</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-with-git-fetch">Updating a repository with git-fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="how-to-get-a-git-repository"></a>How to get a git repository</h2></div></div></div><p>It will be useful to have a git repository to experiment with as you -read this manual.</p><p>The best way to get one is by using the <a href="git-clone.html" target="_top">git-clone(1)</a> command to +read this manual.</p><p>The best way to get one is by using the <a class="ulink" href="git-clone.html" target="_top">git-clone(1)</a> command to download a copy of an existing repository. If you don't already have a project in mind, here are some interesting examples:</p><div class="literallayout"><p> # git itself (approx. 10MB download):<br> $ git clone git://git.kernel.org/pub/scm/git/git.git<br> @@ -16,23 +16,23 @@ will only need to clone once.</p><p>The clone command creates a new directory named after the project ("git" or "linux-2.6" in the examples above). After you cd into this directory, you will see that it contains a copy of the project files, -called the <a href="#def_working_tree">working tree</a>, together with a special +called the <a class="link" href="#def_working_tree">working tree</a>, together with a special top-level directory named ".git", which contains all the information about the history of the project.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="how-to-check-out"></a>How to check out a different version of a project</h2></div></div></div><p>Git is best thought of as a tool for storing the history of a collection of files. It stores the history as a compressed collection of interrelated snapshots of the project's contents. In git each such -version is called a <a href="#def_commit">commit</a>.</p><p>Those snapshots aren't necessarily all arranged in a single line from +version is called a <a class="link" href="#def_commit">commit</a>.</p><p>Those snapshots aren't necessarily all arranged in a single line from oldest to newest; instead, work may simultaneously proceed along -parallel lines of development, called <a href="#def_branch">branches</a>, which may +parallel lines of development, called <a class="link" href="#def_branch">branches</a>, which may merge and diverge.</p><p>A single git repository can track development on multiple branches. It -does this by keeping a list of <a href="#def_head">heads</a> which reference the -latest commit on each branch; the <a href="git-branch.html" target="_top">git-branch(1)</a> command shows +does this by keeping a list of <a class="link" href="#def_head">heads</a> which reference the +latest commit on each branch; the <a class="ulink" href="git-branch.html" target="_top">git-branch(1)</a> command shows you the list of branch heads:</p><div class="literallayout"><p>$ git branch<br> * master</p></div><p>A freshly cloned repository contains a single branch head, by default named "master", with the working directory initialized to the state of -the project referred to by that branch head.</p><p>Most projects also use <a href="#def_tag">tags</a>. Tags, like heads, are +the project referred to by that branch head.</p><p>Most projects also use <a class="link" href="#def_tag">tags</a>. Tags, like heads, are references into the project's history, and can be listed using the -<a href="git-tag.html" target="_top">git-tag(1)</a> command:</p><div class="literallayout"><p>$ git tag -l<br> +<a class="ulink" href="git-tag.html" target="_top">git-tag(1)</a> command:</p><div class="literallayout"><p>$ git tag -l<br> v2.6.11<br> v2.6.11-tree<br> v2.6.12<br> @@ -44,8 +44,8 @@ v2.6.13<br> ...</p></div><p>Tags are expected to always point at the same version of a project, while heads are expected to advance as development progresses.</p><p>Create a new branch head pointing to one of these versions and check it -out using <a href="git-checkout.html" target="_top">git-checkout(1)</a>:</p><div class="literallayout"><p>$ git checkout -b new v2.6.13</p></div><p>The working directory then reflects the contents that the project had -when it was tagged v2.6.13, and <a href="git-branch.html" target="_top">git-branch(1)</a> shows two +out using <a class="ulink" href="git-checkout.html" target="_top">git-checkout(1)</a>:</p><div class="literallayout"><p>$ git checkout -b new v2.6.13</p></div><p>The working directory then reflects the contents that the project had +when it was tagged v2.6.13, and <a class="ulink" href="git-branch.html" target="_top">git-branch(1)</a> shows two branches, with an asterisk marking the currently checked-out branch:</p><div class="literallayout"><p>$ git branch<br> master<br> * new</p></div><p>If you decide that you'd rather see version 2.6.17, you can modify @@ -53,7 +53,7 @@ particular point in history, then resetting that branch may leave you with no way to find the history it used to point to; so use this command carefully.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="understanding-commits"></a>Understanding History: Commits</h2></div></div></div><p>Every change in the history of a project is represented by a commit. -The <a href="git-show.html" target="_top">git-show(1)</a> command shows the most recent commit on the +The <a class="ulink" href="git-show.html" target="_top">git-show(1)</a> command shows the most recent commit on the current branch:</p><div class="literallayout"><p>$ git show<br> commit 17cf781661e6d38f737f15f53ab552f1e95960d7<br> Author: Linus Torvalds <torvalds@ppc970.osdl.org.(none)><br> @@ -85,7 +85,7 @@ commit in their repository that it does in yours (assuming their repository has that commit at all). Since the object name is computed as a hash over the contents of the commit, you are guaranteed that the commit can never change -without its name also changing.</p><p>In fact, in <a href="#git-concepts" title="Chapter 7. Git concepts">Chapter 7, <i>Git concepts</i></a> we shall see that everything stored in git +without its name also changing.</p><p>In fact, in <a class="xref" href="#git-concepts" title="Chapter 7. Git concepts">Chapter 7, <i>Git concepts</i></a> we shall see that everything stored in git history, including file data and directory contents, is stored in an object with a name that is a hash of its contents.</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="understanding-reachability"></a>Understanding history: commits, parents, and reachability</h3></div></div></div><p>Every commit (except the very first commit in a project) also has a parent commit which shows what happened before this commit. @@ -95,7 +95,7 @@ lines of development reconverge is called a "merge". The commit representing a merge can therefore have more than one parent, with each parent representing the most recent commit on one of the lines -of development leading to that point.</p><p>The best way to see how this works is using the <a href="gitk.html" target="_top">gitk(1)</a> +of development leading to that point.</p><p>The best way to see how this works is using the <a class="ulink" href="gitk.html" target="_top">gitk(1)</a> command; running gitk now on a git repository and looking for merge commits will help understand how the git organizes history.</p><p>In the following, we say that commit X is "reachable" from commit Y if commit X is an ancestor of commit Y. Equivalently, you could say @@ -174,7 +174,7 @@ of the HEAD in the repository that you cloned from. That repository may also have had other branches, though, and your local repository keeps branches which track each of those remote branches, which you -can view using the "-r" option to <a href="git-branch.html" target="_top">git-branch(1)</a>:</p><div class="literallayout"><p>$ git branch -r<br> +can view using the "-r" option to <a class="ulink" href="git-branch.html" target="_top">git-branch(1)</a>:</p><div class="literallayout"><p>$ git branch -r<br> origin/HEAD<br> origin/html<br> origin/maint<br> @@ -197,18 +197,18 @@ exists a tag and a branch with the same name.</p><p>(Newly created refs are actually stored in the .git/refs directory, under the path given by their name. However, for efficiency reasons they may also be packed together in a single file; see -<a href="git-pack-refs.html" target="_top">git-pack-refs(1)</a>).</p><p>As another useful shortcut, the "HEAD" of a repository can be referred +<a class="ulink" href="git-pack-refs.html" target="_top">git-pack-refs(1)</a>).</p><p>As another useful shortcut, the "HEAD" of a repository can be referred to just using the name of that repository. So, for example, "origin" is usually a shortcut for the HEAD branch in the repository "origin".</p><p>For the complete list of paths which git checks for references, and the order it uses to decide which to choose when there are multiple references with the same shorthand name, see the "SPECIFYING -REVISIONS" section of <a href="git-rev-parse.html" target="_top">git-rev-parse(1)</a>.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Updating-a-repository-with-git-fetch"></a>Updating a repository with git-fetch</h2></div></div></div><p>Eventually the developer cloned from will do additional work in her +REVISIONS" section of <a class="ulink" href="git-rev-parse.html" target="_top">git-rev-parse(1)</a>.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Updating-a-repository-with-git-fetch"></a>Updating a repository with git-fetch</h2></div></div></div><p>Eventually the developer cloned from will do additional work in her repository, creating new commits and advancing the branches to point at the new commits.</p><p>The command "git fetch", with no arguments, will update all of the remote-tracking branches to the latest version found in her repository. It will not touch any of your own branches—not even the "master" branch that was created for you on clone.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="fetching-branches"></a>Fetching branches from other repositories</h2></div></div></div><p>You can also track branches from repositories other than the one you -cloned from, using <a href="git-remote.html" target="_top">git-remote(1)</a>:</p><div class="literallayout"><p>$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git<br> +cloned from, using <a class="ulink" href="git-remote.html" target="_top">git-remote(1)</a>:</p><div class="literallayout"><p>$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git<br> $ git fetch linux-nfs<br> * refs/remotes/linux-nfs/master: storing branch 'master' ...<br> commit: bf81b46</p></div><p>New remote-tracking branches will be stored under the shorthand name @@ -224,7 +224,7 @@ ...</p></div><p>This is what causes git to track the remote's branches; you may modify or delete these configuration options by editing .git/config with a text editor. (See the "CONFIGURATION FILE" section of -<a href="git-config.html" target="_top">git-config(1)</a> for details.)</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="exploring-git-history"></a>Chapter 2. Exploring git history</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-comments-with-given-content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></div><p>Git is best thought of as a tool for storing the history of a +<a class="ulink" href="git-config.html" target="_top">git-config(1)</a> for details.)</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="exploring-git-history"></a>Chapter 2. Exploring git history</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-comments-with-given-content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></div><p>Git is best thought of as a tool for storing the history of a collection of files. It does this by storing compressed snapshots of the contents of a file hierarchy, together with "commits" which show the relationships between these snapshots.</p><p>Git provides extremely flexible and fast tools for exploring the @@ -233,7 +233,7 @@ "master" crashes. Sometimes the best way to find the cause of such a regression is to perform a brute-force search through the project's history to find the particular commit that caused the problem. The -<a href="git-bisect.html" target="_top">git-bisect(1)</a> command can help you do this:</p><div class="literallayout"><p>$ git bisect start<br> +<a class="ulink" href="git-bisect.html" target="_top">git-bisect(1)</a> command can help you do this:</p><div class="literallayout"><p>$ git bisect start<br> $ git bisect good v2.6.18<br> $ git bisect bad master<br> Bisecting: 3537 revisions left to test after this<br> @@ -248,7 +248,7 @@ that the number of revisions left to test is cut approximately in half each time.</p><p>After about 13 tests (in this case), it will output the commit id of the guilty commit. You can then examine the commit with -<a href="git-show.html" target="_top">git-show(1)</a>, find out who wrote it, and mail them your bug +<a class="ulink" href="git-show.html" target="_top">git-show(1)</a>, find out who wrote it, and mail them your bug report with the commit id. Finally, run</p><div class="literallayout"><p>$ git bisect reset</p></div><p>to return you to the branch you were on before and delete the temporary "bisect" branch.</p><p>Note that the version which git-bisect checks out for you at each point is just a suggestion, and you're free to try a different @@ -265,11 +265,11 @@ </li><li> tag name: refers to the commit pointed to by the given tag (we've seen branches and tags are special cases of - <a href="#how-git-stores-references" title="Naming branches, tags, and other references">references</a>). + <a class="link" href="#how-git-stores-references" title="Naming branches, tags, and other references">references</a>). </li><li> HEAD: refers to the head of the current branch </li></ul></div><p>There are many more; see the "SPECIFYING REVISIONS" section of the -<a href="git-rev-parse.html" target="_top">git-rev-parse(1)</a> man page for the complete list of ways to +<a class="ulink" href="git-rev-parse.html" target="_top">git-rev-parse(1)</a> man page for the complete list of ways to name revisions. Some examples:</p><div class="literallayout"><p>$ git show fb47ddb2 # the first few characters of the object name<br> # are usually enough to specify it uniquely<br> $ git show HEAD^ # the parent of the HEAD commit<br> @@ -284,14 +284,14 @@ branch in FETCH_HEAD. For example, if you run git fetch without specifying a local branch as the target of the operation</p><div class="literallayout"><p>$ git fetch git://example.com/proj.git theirbranch</p></div><p>the fetched commits will still be available from FETCH_HEAD.</p><p>When we discuss merges we'll also see the special name MERGE_HEAD, which refers to the other branch that we're merging in to the current -branch.</p><p>The <a href="git-rev-parse.html" target="_top">git-rev-parse(1)</a> command is a low-level command that is +branch.</p><p>The <a class="ulink" href="git-rev-parse.html" target="_top">git-rev-parse(1)</a> command is a low-level command that is occasionally useful for translating some name for a commit to the object name for that commit:</p><div class="literallayout"><p>$ git rev-parse origin<br> e05db0fd4f31dde7005f075a84f96b360d05984b</p></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="creating-tags"></a>Creating tags</h2></div></div></div><p>We can also create a tag to refer to a particular commit; after running</p><div class="literallayout"><p>$ git tag stable-1 1b2e1d63ff</p></div><p>You can use stable-1 to refer to the commit 1b2e1d63ff.</p><p>This creates a "lightweight" tag. If you would also like to include a comment with the tag, and possibly sign it cryptographically, then you -should create a tag object instead; see the <a href="git-tag.html" target="_top">git-tag(1)</a> man page -for details.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="browsing-revisions"></a>Browsing revisions</h2></div></div></div><p>The <a href="git-log.html" target="_top">git-log(1)</a> command can show lists of commits. On its +should create a tag object instead; see the <a class="ulink" href="git-tag.html" target="_top">git-tag(1)</a> man page +for details.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="browsing-revisions"></a>Browsing revisions</h2></div></div></div><p>The <a class="ulink" href="git-log.html" target="_top">git-log(1)</a> command can show lists of commits. On its own, it shows all commits reachable from the parent commit; but you can also make more specific requests:</p><div class="literallayout"><p>$ git log v2.5.. # commits since (not reachable from) v2.5<br> $ git log test..master # commits reachable from master but not test<br> @@ -303,22 +303,22 @@ $ git log fs/ # ... which modify any file under fs/<br> $ git log -S'foo()' # commits which add or remove any file data<br> # matching the string 'foo()'</p></div><p>And of course you can combine all of these; the following finds -commits since v2.5 which touch the Makefile or any file under fs:</p><div class="literallayout"><p>$ git log v2.5.. Makefile fs/</p></div><p>You can also ask git log to show patches:</p><div class="literallayout"><p>$ git log -p</p></div><p>See the "—pretty" option in the <a href="git-log.html" target="_top">git-log(1)</a> man page for more +commits since v2.5 which touch the Makefile or any file under fs:</p><div class="literallayout"><p>$ git log v2.5.. Makefile fs/</p></div><p>You can also ask git log to show patches:</p><div class="literallayout"><p>$ git log -p</p></div><p>See the "—pretty" option in the <a class="ulink" href="git-log.html" target="_top">git-log(1)</a> man page for more display options.</p><p>Note that git log starts with the most recent commit and works backwards through the parents; however, since git history can contain multiple independent lines of development, the particular order that commits are listed in may be somewhat arbitrary.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="generating-diffs"></a>Generating diffs</h2></div></div></div><p>You can generate diffs between any two versions using -<a href="git-diff.html" target="_top">git-diff(1)</a>:</p><div class="literallayout"><p>$ git diff master..test</p></div><p>That will produce the diff between the tips of the two branches. If +<a class="ulink" href="git-diff.html" target="_top">git-diff(1)</a>:</p><div class="literallayout"><p>$ git diff master..test</p></div><p>That will produce the diff between the tips of the two branches. If you'd prefer to find the diff from their common ancestor to test, you can use three dots instead of two:</p><div class="literallayout"><p>$ git diff master...test</p></div><p>Sometimes what you want instead is a set of patches; for this you can -use <a href="git-format-patch.html" target="_top">git-format-patch(1)</a>:</p><div class="literallayout"><p>$ git format-patch master..test</p></div><p>will generate a file with a patch for each commit reachable from test +use <a class="ulink" href="git-format-patch.html" target="_top">git-format-patch(1)</a>:</p><div class="literallayout"><p>$ git format-patch master..test</p></div><p>will generate a file with a patch for each commit reachable from test but not from master.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="viewing-old-file-versions"></a>Viewing old file versions</h2></div></div></div><p>You can always view an old version of a file by just checking out the correct revision first. But sometimes it is more convenient to be able to view an old version of a single file without checking anything out; this command does that:</p><div class="literallayout"><p>$ git show v2.5:fs/locks.c</p></div><p>Before the colon may be anything that names a commit, and after it may be any path to a file tracked by git.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="history-examples"></a>Examples</h2></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="counting-commits-on-a-branch"></a>Counting the number of commits on a branch</h3></div></div></div><p>Suppose you want to know how many commits you've made on "mybranch" since it diverged from "origin":</p><div class="literallayout"><p>$ git log --pretty=oneline origin..mybranch | wc -l</p></div><p>Alternatively, you may often see this sort of thing done with the -lower-level command <a href="git-rev-list.html" target="_top">git-rev-list(1)</a>, which just lists the SHA1's +lower-level command <a class="ulink" href="git-rev-list.html" target="_top">git-rev-list(1)</a>, which just lists the SHA1's of all the given commits:</p><div class="literallayout"><p>$ git rev-list origin..mybranch | wc -l</p></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="checking-for-equal-branches"></a>Check whether two branches point at the same history</h3></div></div></div><p>Suppose you want to check whether two branches point at the same point in history.</p><div class="literallayout"><p>$ git diff origin..master</p></div><p>will tell you whether the contents of the project are the same at the two branches; in theory, however, it's possible that the same project @@ -332,19 +332,19 @@ You'd like to find the earliest tagged release that contains that fix.</p><p>Of course, there may be more than one answer—if the history branched after commit e05db0fd, then there could be multiple "earliest" tagged -releases.</p><p>You could just visually inspect the commits since e05db0fd:</p><div class="literallayout"><p>$ gitk e05db0fd..</p></div><p>Or you can use <a href="git-name-rev.html" target="_top">git-name-rev(1)</a>, which will give the commit a +releases.</p><p>You could just visually inspect the commits since e05db0fd:</p><div class="literallayout"><p>$ gitk e05db0fd..</p></div><p>Or you can use <a class="ulink" href="git-name-rev.html" target="_top">git-name-rev(1)</a>, which will give the commit a name based on any tag it finds pointing to one of the commit's descendants:</p><div class="literallayout"><p>$ git name-rev --tags e05db0fd<br> -e05db0fd tags/v1.5.0-rc1^0~23</p></div><p>The <a href="git-describe.html" target="_top">git-describe(1)</a> command does the opposite, naming the +e05db0fd tags/v1.5.0-rc1^0~23</p></div><p>The <a class="ulink" href="git-describe.html" target="_top">git-describe(1)</a> command does the opposite, naming the revision using a tag on which the given commit is based:</p><div class="literallayout"><p>$ git describe e05db0fd<br> v1.5.0-rc0-260-ge05db0f</p></div><p>but that may sometimes help you guess which tags might come after the given commit.</p><p>If you just want to verify whether a given tagged version contains a -given commit, you could use <a href="git-merge-base.html" target="_top">git-merge-base(1)</a>:</p><div class="literallayout"><p>$ git merge-base e05db0fd v1.5.0-rc1<br> +given commit, you could use <a class="ulink" href="git-merge-base.html" target="_top">git-merge-base(1)</a>:</p><div class="literallayout"><p>$ git merge-base e05db0fd v1.5.0-rc1<br> e05db0fd4f31dde7005f075a84f96b360d05984b</p></div><p>The merge-base command finds a common ancestor of the given commits, and always returns one or the other in the case where one is a descendant of the other; so the above output shows that e05db0fd actually is an ancestor of v1.5.0-rc1.</p><p>Alternatively, note that</p><div class="literallayout"><p>$ git log v1.5.0-rc1..e05db0fd</p></div><p>will produce empty output if and only if v1.5.0-rc1 includes e05db0fd, -because it outputs only commits that are not reachable from v1.5.0-rc1.</p><p>As yet another alternative, the <a href="git-show-branch.html" target="_top">git-show-branch(1)</a> command lists +because it outputs only commits that are not reachable from v1.5.0-rc1.</p><p>As yet another alternative, the <a class="ulink" href="git-show-branch.html" target="_top">git-show-branch(1)</a> command lists the commits reachable from its arguments with a display on the left-hand side that indicates which arguments that commit is reachable from. So, you can run something like</p><div class="literallayout"><p>$ git show-branch e05db0fd v1.5.0-rc0 v1.5.0-rc1 v1.5.0-rc2<br> @@ -357,7 +357,7 @@ available</p></div><p>Which shows that e05db0fd is reachable from itself, from v1.5.0-rc1, and from v1.5.0-rc2, but not from v1.5.0-rc0.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="showing-commits-unique-to-a-branch"></a>Showing commits unique to a given branch</h3></div></div></div><p>Suppose you would like to see all the commits reachable from the branch head named "master" but not from any other head in your repository.</p><p>We can list all the heads in this repository with -<a href="git-show-ref.html" target="_top">git-show-ref(1)</a>:</p><div class="literallayout"><p>$ git show-ref --heads<br> +<a class="ulink" href="git-show-ref.html" target="_top">git-show-ref(1)</a>:</p><div class="literallayout"><p>$ git show-ref --heads<br> bf62196b5e363d73353a9dcf094c59595f3153b7 refs/heads/core-tutorial<br> db768d5504c1bb46f63ee9d6e1772bd047e05bf9 refs/heads/maint<br> a07157ac624b2524a059a3414e99f6f44bebc1e7 refs/heads/master<br> @@ -370,8 +370,8 @@ refs/heads/tutorial-fixes</p></div><p>And then we can ask to see all the commits reachable from master but not from these other heads:</p><div class="literallayout"><p>$ gitk master --not $( git show-ref --heads | cut -d' ' -f2 |<br> grep -v '^refs/heads/master' )</p></div><p>Obviously, endless variations are possible; for example, to see all -commits reachable from some head but not from any tag in the repository:</p><div class="literallayout"><p>$ gitk $( git show-ref --heads ) --not $( git show-ref --tags )</p></div><p>(See <a href="git-rev-parse.html" target="_top">git-rev-parse(1)</a> for explanations of commit-selecting -syntax such as <code class="literal">—not</code>.)</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="making-a-release"></a>Creating a changelog and tarball for a software release</h3></div></div></div><p>The <a href="git-archive.html" target="_top">git-archive(1)</a> command can create a tar or zip archive from +commits reachable from some head but not from any tag in the repository:</p><div class="literallayout"><p>$ gitk $( git show-ref --heads ) --not $( git show-ref --tags )</p></div><p>(See <a class="ulink" href="git-rev-parse.html" target="_top">git-rev-parse(1)</a> for explanations of commit-selecting +syntax such as <code class="literal">—not</code>.)</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="making-a-release"></a>Creating a changelog and tarball for a software release</h3></div></div></div><p>The <a class="ulink" href="git-archive.html" target="_top">git-archive(1)</a> command can create a tar or zip archive from any version of a project; for example:</p><div class="literallayout"><p>$ git archive --format=tar --prefix=project/ HEAD | gzip >latest.tar.gz</p></div><p>will use HEAD to produce a tar archive in which each filename is preceded by "project/".</p><p>If you're releasing a new version of a software project, you may want to simultaneously make a changelog to include in the release @@ -390,12 +390,12 @@ file such that it contained the given content either before or after the commit. You can find out with this:</p><div class="literallayout"><p>$ git log --raw --abbrev=40 --pretty=oneline |<br> grep -B 1 `git hash-object filename`</p></div><p>Figuring out why this works is left as an exercise to the (advanced) -student. The <a href="git-log.html" target="_top">git-log(1)</a>, <a href="git-diff-tree.html" target="_top">git-diff-tree(1)</a>, and -<a href="git-hash-object.html" target="_top">git-hash-object(1)</a> man pages may prove helpful.</p></div></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Developing-with-git"></a>Chapter 3. Developing with git</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="telling-git-your-name"></a>Telling git your name</h2></div></div></div><p>Before creating any commits, you should introduce yourself to git. The +student. The <a class="ulink" href="git-log.html" target="_top">git-log(1)</a>, <a class="ulink" href="git-diff-tree.html" target="_top">git-diff-tree(1)</a>, and +<a class="ulink" href="git-hash-object.html" target="_top">git-hash-object(1)</a> man pages may prove helpful.</p></div></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Developing-with-git"></a>Chapter 3. Developing with git</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="telling-git-your-name"></a>Telling git your name</h2></div></div></div><p>Before creating any commits, you should introduce yourself to git. The easiest way to do so is to make sure the following lines appear in a file named .gitconfig in your home directory:</p><div class="literallayout"><p>[user]<br> name = Your Name Comes Here<br> - email = you@yourdomain.example.com</p></div><p>(See the "CONFIGURATION FILE" section of <a href="git-config.html" target="_top">git-config(1)</a> for + email = you@yourdomain.example.com</p></div><p>(See the "CONFIGURATION FILE" section of <a class="ulink" href="git-config.html" target="_top">git-config(1)</a> for details on the configuration file.)</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="creating-a-new-repository"></a>Creating a new repository</h2></div></div></div><p>Creating a new repository from scratch is very easy:</p><div class="literallayout"><p>$ mkdir project<br> $ cd project<br> $ git init</p></div><p>If you have some initial content (say, a tarball):</p><div class="literallayout"><p>$ tar -xzvf project.tar.gz<br> @@ -429,7 +429,7 @@ # be included if you ran "commit" now.<br> $ git diff HEAD # difference between HEAD and working tree; what<br> # would be committed if you ran "commit -a" now.<br> -$ git status # a brief per-file summary of the above.</p></div><p>You can also use <a href="git-gui.html" target="_top">git-gui(1)</a> to create commits, view changes in +$ git status # a brief per-file summary of the above.</p></div><p>You can also use <a class="ulink" href="git-gui.html" target="_top">git-gui(1)</a> to create commits, view changes in the index and the working tree files, and individually select diff hunks for inclusion in the index (by right-clicking on the diff hunk and choosing "Stage Hunk For Commit").</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="creating-good-commit-messages"></a>Creating good commit messages</h2></div></div></div><p>Though not required, it's a good idea to begin the commit message @@ -452,7 +452,7 @@ # except foo.html which is maintained by hand.<br> !foo.html<br> # Ignore objects and archives.<br> -*.[oa]</p></div><p>See <a href="gitignore.html" target="_top">gitignore(5)</a> for a detailed explanation of the syntax. You can +*.[oa]</p></div><p>See <a class="ulink" href="gitignore.html" target="_top">gitignore(5)</a> for a detailed explanation of the syntax. You can also place .gitignore files in other directories in your working tree, and they will apply to those directories and their subdirectories. The <code class="literal">.gitignore</code> files can be added to your repository like any other files (just run <code class="literal">git add @@ -463,8 +463,8 @@ them in a file in your repository named .git/info/exclude, or in any file specified by the <code class="literal">core.excludesfile</code> configuration variable. Some git commands can also take exclude patterns directly on the command line. -See <a href="gitignore.html" target="_top">gitignore(5)</a> for the details.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="how-to-merge"></a>How to merge</h2></div></div></div><p>You can rejoin two diverging branches of development using -<a href="git-merge.html" target="_top">git-merge(1)</a>:</p><div class="literallayout"><p>$ git merge branchname</p></div><p>merges the development in the branch "branchname" into the current +See <a class="ulink" href="gitignore.html" target="_top">gitignore(5)</a> for the details.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="how-to-merge"></a>How to merge</h2></div></div></div><p>You can rejoin two diverging branches of development using +<a class="ulink" href="git-merge.html" target="_top">git-merge(1)</a>:</p><div class="literallayout"><p>$ git merge branchname</p></div><p>merges the development in the branch "branchname" into the current branch. If there are conflicts—for example, if the same file is modified in two different ways in the remote branch and the local branch—then you are warned; the output may look something like this:</p><div class="literallayout"><p>$ git merge next<br> @@ -479,9 +479,9 @@ one to the top of the other branch.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="resolving-a-merge"></a>Resolving a merge</h2></div></div></div><p>When a merge isn't resolved automatically, git leaves the index and the working tree in a special state that gives you all the information you need to help resolve the merge.</p><p>Files with conflicts are marked specially in the index, so until you -resolve the problem and update the index, <a href="git-commit.html" target="_top">git-commit(1)</a> will +resolve the problem and update the index, <a class="ulink" href="git-commit.html" target="_top">git-commit(1)</a> will fail:</p><div class="literallayout"><p>$ git commit<br> -file.txt: needs merge</p></div><p>Also, <a href="git-status.html" target="_top">git-status(1)</a> will list those files as "unmerged", and the +file.txt: needs merge</p></div><p>Also, <a class="ulink" href="git-status.html" target="_top">git-status(1)</a> will list those files as "unmerged", and the files with conflicts will have conflict markers added, like this:</p><div class="literallayout"><p><<<<<<< HEAD:file.txt<br> Hello world<br> =======<br> @@ -492,7 +492,7 @@ default message unchanged, but you may add additional commentary of your own if desired.</p><p>The above is all you need to know to resolve a simple merge. But git also provides more information to help resolve conflicts:</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="conflict-resolution"></a>Getting conflict-resolution help during a merge</h3></div></div></div><p>All of the changes that git was able to merge automatically are -already added to the index file, so <a href="git-diff.html" target="_top">git-diff(1)</a> shows only +already added to the index file, so <a class="ulink" href="git-diff.html" target="_top">git-diff(1)</a> shows only the conflicts. It uses an unusual syntax:</p><div class="literallayout"><p>$ git diff<br> diff --cc file.txt<br> index 802992c,2b60207..0000000<br> @@ -509,7 +509,7 @@ tip of the other branch, which is stored temporarily in MERGE_HEAD.</p><p>During the merge, the index holds three versions of each file. Each of these three "file stages" represents a different version of the file:</p><div class="literallayout"><p>$ git show :1:file.txt # the file in a common ancestor of both branches<br> $ git show :2:file.txt # the version from HEAD.<br> -$ git show :3:file.txt # the version from MERGE_HEAD.</p></div><p>When you ask <a href="git-diff.html" target="_top">git-diff(1)</a> to show the conflicts, it runs a +$ git show :3:file.txt # the version from MERGE_HEAD.</p></div><p>When you ask <a class="ulink" href="git-diff.html" target="_top">git-diff(1)</a> to show the conflicts, it runs a three-way diff between the conflicted merge results in the work tree with stages 2 and 3 to show only hunks whose contents come from both sides, mixed (in other words, when a hunk's merge results come only from stage 2, @@ -519,7 +519,7 @@ column is used for differences between the first parent and the working directory copy, and the second for differences between the second parent and the working directory copy. (See the "COMBINED DIFF FORMAT" section -of <a href="git-diff-files.html" target="_top">git-diff-files(1)</a> for a details of the format.)</p><p>After resolving the conflict in the obvious way (but before updating the +of <a class="ulink" href="git-diff-files.html" target="_top">git-diff-files(1)</a> for a details of the format.)</p><p>After resolving the conflict in the obvious way (but before updating the index), the diff will look like:</p><div class="literallayout"><p>$ git diff<br> diff --cc file.txt<br> index 802992c,2b60207..0000000<br> @@ -536,10 +536,10 @@ $ git diff -2 file.txt # diff against stage 2<br> $ git diff --ours file.txt # same as the above<br> $ git diff -3 file.txt # diff against stage 3<br> -$ git diff --theirs file.txt # same as the above.</p></div><p>The <a href="git-log.html" target="_top">git-log(1)</a> and gitk[1] commands also provide special help +$ git diff --theirs file.txt # same as the above.</p></div><p>The <a class="ulink" href="git-log.html" target="_top">git-log(1)</a> and <a class="ulink" href="gitk.html" target="_top">gitk(1)</a> commands also provide special help for merges:</p><div class="literallayout"><p>$ git log --merge<br> $ gitk --merge</p></div><p>These will display all commits which exist only on HEAD or on -MERGE_HEAD, and which touch an unmerged file.</p><p>You may also use <a href="git-mergetool.html" target="_top">git-mergetool(1)</a>, which lets you merge the +MERGE_HEAD, and which touch an unmerged file.</p><p>You may also use <a class="ulink" href="git-mergetool.html" target="_top">git-mergetool(1)</a>, which lets you merge the unmerged files using external tools such as emacs or kdiff3.</p><p>Each time you resolve the conflicts in a file and update the index:</p><div class="literallayout"><p>$ git add file.txt</p></div><p>the different stages of that file will be "collapsed", after which git-diff will (by default) no longer show diffs for that file.</p></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="undoing-a-merge"></a>Undoing a merge</h2></div></div></div><p>If you get stuck and decide to just give up and throw the whole mess away, you can always return to the pre-merge state with</p><div class="literallayout"><p>$ git reset --hard HEAD</p></div><p>Or, if you've already committed the merge that you want to throw away,</p><div class="literallayout"><p>$ git reset --hard ORIG_HEAD</p></div><p>However, this last command can be dangerous in some cases—never @@ -566,30 +566,30 @@ change, and cannot correctly perform repeated merges from a branch that has had its history changed. </li></ol></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="reverting-a-commit"></a>Fixing a mistake with a new commit</h3></div></div></div><p>Creating a new commit that reverts an earlier change is very easy; -just pass the <a href="git-revert.html" target="_top">git-revert(1)</a> command a reference to the bad +just pass the <a class="ulink" href="git-revert.html" target="_top">git-revert(1)</a> command a reference to the bad commit; for example, to revert the most recent commit:</p><div class="literallayout"><p>$ git revert HEAD</p></div><p>This will create a new commit which undoes the change in HEAD. You will be given a chance to edit the commit message for the new commit.</p><p>You can also revert an earlier change, for example, the next-to-last:</p><div class="literallayout"><p>$ git revert HEAD^</p></div><p>In this case git will attempt to undo the old change while leaving intact any changes made since then. If more recent changes overlap with the changes to be reverted, then you will be asked to fix -conflicts manually, just as in the case of <a href="#resolving-a-merge" title="Resolving a merge">resolving a merge</a>.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="fixing-a-mistake-by-rewriting-history"></a>Fixing a mistake by rewriting history</h3></div></div></div><p>If the problematic commit is the most recent commit, and you have not +conflicts manually, just as in the case of <a class="link" href="#resolving-a-merge" title="Resolving a merge">resolving a merge</a>.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="fixing-a-mistake-by-rewriting-history"></a>Fixing a mistake by rewriting history</h3></div></div></div><p>If the problematic commit is the most recent commit, and you have not yet made that commit public, then you may just -<a href="#undoing-a-merge" title="Undoing a merge">destroy it using git-reset</a>.</p><p>Alternatively, you +<a class="link" href="#undoing-a-merge" title="Undoing a merge">destroy it using git-reset</a>.</p><p>Alternatively, you can edit the working directory and update the index to fix your -mistake, just as if you were going to <a href="#how-to-make-a-commit" title="How to make a commit">create a new commit</a>, then run</p><div class="literallayout"><p>$ git commit --amend</p></div><p>which will replace the old commit by a new commit incorporating your +mistake, just as if you were going to <a class="link" href="#how-to-make-a-commit" title="How to make a commit">create a new commit</a>, then run</p><div class="literallayout"><p>$ git commit --amend</p></div><p>which will replace the old commit by a new commit incorporating your changes, giving you a chance to edit the old commit message first.</p><p>Again, you should never do this to a commit that may already have -been merged into another branch; use <a href="git-revert.html" target="_top">git-revert(1)</a> instead in +been merged into another branch; use <a class="ulink" href="git-revert.html" target="_top">git-revert(1)</a> instead in that case.</p><p>It is also possible to replace commits further back in the history, but this is an advanced topic to be left for -<a href="#cleaning-up-history" title="Chapter 5. Rewriting history and maintaining patch series">another chapter</a>.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="checkout-of-path"></a>Checking out an old version of a file</h3></div></div></div><p>In the process of undoing a previous bad change, you may find it +<a class="link" href="#cleaning-up-history" title="Chapter 5. Rewriting history and maintaining patch series">another chapter</a>.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="checkout-of-path"></a>Checking out an old version of a file</h3></div></div></div><p>In the process of undoing a previous bad change, you may find it useful to check out an older version of a particular file using -<a href="git-checkout.html" target="_top">git-checkout(1)</a>. We've used git-checkout before to switch +<a class="ulink" href="git-checkout.html" target="_top">git-checkout(1)</a>. We've used git-checkout before to switch branches, but it has quite different behavior if it is given a path name: the command</p><div class="literallayout"><p>$ git checkout HEAD^ path/to/file</p></div><p>replaces path/to/file by the contents it had in the commit HEAD^, and also updates the index to match. It does not change branches.</p><p>If you just want to look at an old version of the file, without modifying the working directory, you can do that with -<a href="git-show.html" target="_top">git-show(1)</a>:</p><div class="literallayout"><p>$ git show HEAD^:path/to/file</p></div><p>which will display the given version of the file.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="interrupted-work"></a>Temporarily setting aside work in progress</h3></div></div></div><p>While you are in the middle of working on something complicated, you +<a class="ulink" href="git-show.html" target="_top">git-show(1)</a>:</p><div class="literallayout"><p>$ git show HEAD^:path/to/file</p></div><p>which will display the given version of the file.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="interrupted-work"></a>Temporarily setting aside work in progress</h3></div></div></div><p>While you are in the middle of working on something complicated, you find an unrelated but obvious and trivial bug. You would like to fix it -before continuing. You can use <a href="git-stash.html" target="_top">git-stash(1)</a> to save the current +before continuing. You can use <a class="ulink" href="git-stash.html" target="_top">git-stash(1)</a> to save the current state of your work, and after fixing the bug (or, optionally after doing so on a different branch and then coming back), unstash the work-in-progress changes.</p><div class="literallayout"><p>$ git stash "work in progress for foo feature"</p></div><p>This command will save your changes away to the <code class="literal">stash</code>, and @@ -598,8 +598,8 @@ $ git commit -a -m "blorpl: typofix"</p></div><p>After that, you can go back to what you were working on with <code class="literal">git stash apply</code>:</p><div class="literallayout"><p>$ git stash apply</p></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ensuring-good-performance"></a>Ensuring good performance</h2></div></div></div><p>On large repositories, git depends on compression to keep the history information from taking up too much space on disk or in memory.</p><p>This compression is not performed automatically. Therefore you -should occasionally run <a href="git-gc.html" target="_top">git-gc(1)</a>:</p><div class="literallayout"><p>$ git gc</p></div><p>to recompress the archive. This can be very time-consuming, so -you may prefer to run git-gc when you are not doing other work.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ensuring-reliability"></a>Ensuring reliability</h2></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="checking-for-corruption"></a>Checking the repository for corruption</h3></div></div></div><p>The <a href="git-fsck.html" target="_top">git-fsck(1)</a> command runs a number of self-consistency checks +should occasionally run <a class="ulink" href="git-gc.html" target="_top">git-gc(1)</a>:</p><div class="literallayout"><p>$ git gc</p></div><p>to recompress the archive. This can be very time-consuming, so +you may prefer to run git-gc when you are not doing other work.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ensuring-reliability"></a>Ensuring reliability</h2></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="checking-for-corruption"></a>Checking the repository for corruption</h3></div></div></div><p>The <a class="ulink" href="git-fsck.html" target="_top">git-fsck(1)</a> command runs a number of self-consistency checks on the repository, and reports on any problems. This may take some time. The most common warning by far is about "dangling" objects:</p><div class="literallayout"><p>$ git fsck<br> dangling commit 7281251ddd2a61e38657c827739c57015671a6b3<br> @@ -612,7 +612,7 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f<br> ...</p></div><p>Dangling objects are not a problem. At worst they may take up a little extra disk space. They can sometimes provide a last-resort method for -recovering lost work—see <a href="#dangling-objects" title="Dangling objects">the section called “Dangling objects”</a> for details.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="recovering-lost-changes"></a>Recovering lost changes</h3></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="reflogs"></a>Reflogs</h4></div></div></div><p>Say you modify a branch with <code class="literal"><a href="git-reset.html" target="_top">git-reset(1)</a> —hard</code>, and then +recovering lost work—see <a class="xref" href="#dangling-objects" title="Dangling objects">the section called “Dangling objects”</a> for details.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="recovering-lost-changes"></a>Recovering lost changes</h3></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="reflogs"></a>Reflogs</h4></div></div></div><p>Say you modify a branch with <code class="literal"><a class="ulink" href="git-reset.html" target="_top">git-reset(1)</a> —hard</code>, and then realize that the branch was the only reference you had to that point in history.</p><p>Fortunately, git also keeps a log, called a "reflog", of all the previous values of each branch. So in this case you can still find the @@ -625,9 +625,9 @@ $ git log --walk-reflogs master # show reflog entries for master</p></div><p>A separate reflog is kept for the HEAD, so</p><div class="literallayout"><p>$ git show HEAD@{"1 week ago"}</p></div><p>will show what HEAD pointed to one week ago, not what the current branch pointed to one week ago. This allows you to see the history of what you've checked out.</p><p>The reflogs are kept by default for 30 days, after which they may be -pruned. See <a href="git-reflog.html" target="_top">git-reflog(1)</a> and <a href="git-gc.html" target="_top">git-gc(1)</a> to learn +pruned. See <a class="ulink" href="git-reflog.html" target="_top">git-reflog(1)</a> and <a class="ulink" href="git-gc.html" target="_top">git-gc(1)</a> to learn how to control this pruning, and see the "SPECIFYING REVISIONS" -section of <a href="git-rev-parse.html" target="_top">git-rev-parse(1)</a> for details.</p><p>Note that the reflog history is very different from normal git history. +section of <a class="ulink" href="git-rev-parse.html" target="_top">git-rev-parse(1)</a> for details.</p><p>Note that the reflog history is very different from normal git history. While normal history is shared by every repository that works on the same project, the reflog history is not shared: it tells you only about how the branches in your local repository have changed over time.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="dangling-object-recovery"></a>Examining dangling objects</h4></div></div></div><p>In some situations the reflog may not be able to save you. For example, @@ -635,7 +635,7 @@ contained. The reflog is also deleted; however, if you have not yet pruned the repository, then you may still be able to find the lost commits in the dangling objects that git-fsck reports. See -<a href="#dangling-objects" title="Dangling objects">the section called “Dangling objects”</a> for the details.</p><div class="literallayout"><p>$ git fsck<br> +<a class="xref" href="#dangling-objects" title="Dangling objects">the section called “Dangling objects”</a> for the details.</p><div class="literallayout"><p>$ git fsck<br> dangling commit 7281251ddd2a61e38657c827739c57015671a6b3<br> dangling commit 2706a059f258c6b245f298dc4ff2ccd30ec21a63<br> dangling commit 13472b7c4b80851a1bc551779171dcb03655e9b5<br> @@ -650,35 +650,35 @@ reference pointing to it, for example, a new branch:</p><div class="literallayout"><p>$ git branch recovered-branch 7281251ddd</p></div><p>Other types of dangling objects (blobs and trees) are also possible, and dangling objects can arise in other situations.</p></div></div></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="sharing-development"></a>Chapter 4. Sharing development with others</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#getting-updates-with-git-pull">Getting updates with git-pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a git repository via the git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via http</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="getting-updates-with-git-pull"></a>Getting updates with git-pull</h2></div></div></div><p>After you clone a repository and make a few changes of your own, you may wish to check the original repository for updates and merge them -into your own work.</p><p>We have already seen <a href="#Updating-a-repository-with-git-fetch" title="Updating a repository with git-fetch">how to keep remote tracking branches up to date</a> with <a href="git-fetch.html" target="_top">git-fetch(1)</a>, +into your own work.</p><p>We have already seen <a class="link" href="#Updating-a-repository-with-git-fetch" title="Updating a repository with git-fetch">how to keep remote tracking branches up to date</a> with <a class="ulink" href="git-fetch.html" target="_top">git-fetch(1)</a>, and how to merge two branches. So you can merge in changes from the original repository's master branch with:</p><div class="literallayout"><p>$ git fetch<br> -$ git merge origin/master</p></div><p>However, the <a href="git-pull.html" target="_top">git-pull(1)</a> command provides a way to do this in +$ git merge origin/master</p></div><p>However, the <a class="ulink" href="git-pull.html" target="_top">git-pull(1)</a> command provides a way to do this in one step:</p><div class="literallayout"><p>$ git pull origin master</p></div><p>In fact, if you have "master" checked out, then by default "git pull" merges from the HEAD branch of the origin repository. So often you can accomplish the above with just a simple</p><div class="literallayout"><p>$ git pull</p></div><p>More generally, a branch that is created from a remote branch will pull by default from that branch. See the descriptions of the branch.<name>.remote and branch.<name>.merge options in -<a href="git-config.html" target="_top">git-config(1)</a>, and the discussion of the <code class="literal">—track</code> option in -<a href="git-checkout.html" target="_top">git-checkout(1)</a>, to learn how to control these defaults.</p><p>In addition to saving you keystrokes, "git pull" also helps you by +<a class="ulink" href="git-config.html" target="_top">git-config(1)</a>, and the discussion of the <code class="literal">—track</code> option in +<a class="ulink" href="git-checkout.html" target="_top">git-checkout(1)</a>, to learn how to control these defaults.</p><p>In addition to saving you keystrokes, "git pull" also helps you by producing a default commit message documenting the branch and repository that you pulled from.</p><p>(But note that no such commit will be created in the case of a -<a href="#fast-forwards" title="Fast-forward merges">fast forward</a>; instead, your branch will just be +<a class="link" href="#fast-forwards" title="Fast-forward merges">fast forward</a>; instead, your branch will just be updated to point to the latest commit from the upstream branch.)</p><p>The git-pull command can also be given "." as the "remote" repository, in which case it just merges in a branch from the current repository; so the commands</p><div class="literallayout"><p>$ git pull . branch<br> $ git merge branch</p></div><p>are roughly equivalent. The former is actually very commonly used.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="submitting-patches"></a>Submitting patches to a project</h2></div></div></div><p>If you just have a few changes, the simplest way to submit them may -just be to send them as patches in email:</p><p>First, use <a href="git-format-patch.html" target="_top">git-format-patch(1)</a>; for example:</p><div class="literallayout"><p>$ git format-patch origin</p></div><p>will produce a numbered series of files in the current directory, one +just be to send them as patches in email:</p><p>First, use <a class="ulink" href="git-format-patch.html" target="_top">git-format-patch(1)</a>; for example:</p><div class="literallayout"><p>$ git format-patch origin</p></div><p>will produce a numbered series of files in the current directory, one for each patch in the current branch but not in origin/HEAD.</p><p>You can then import these into your mail client and send them by hand. However, if you have a lot to send at once, you may prefer to -use the <a href="git-send-email.html" target="_top">git-send-email(1)</a> script to automate the process. +use the <a class="ulink" href="git-send-email.html" target="_top">git-send-email(1)</a> script to automate the process. Consult the mailing list for your project first to determine how they -prefer such patches be handled.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="importing-patches"></a>Importing patches to a project</h2></div></div></div><p>Git also provides a tool called <a href="git-am.html" target="_top">git-am(1)</a> (am stands for +prefer such patches be handled.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="importing-patches"></a>Importing patches to a project</h2></div></div></div><p>Git also provides a tool called <a class="ulink" href="git-am.html" target="_top">git-am(1)</a> (am stands for "apply mailbox"), for importing such an emailed series of patches. Just save all of the patch-containing messages, in order, into a single mailbox file, say "patches.mbox", then run</p><div class="literallayout"><p>$ git am -3 patches.mbox</p></div><p>Git will apply each patch in order; if any conflicts are found, it will stop, and you can fix the conflicts as described in -"<a href="#resolving-a-merge" title="Resolving a merge">Resolving a merge</a>". (The "-3" option tells +"<a class="link" href="#resolving-a-merge" title="Resolving a merge">Resolving a merge</a>". (The "-3" option tells git to perform a merge; if you would prefer it just to abort and leave your tree and index untouched, you may omit that option.)</p><p>Once the index is updated with the results of the conflict resolution, instead of creating a new commit, just run</p><div class="literallayout"><p>$ git am --resolved</p></div><p>and git will create the commit for you and continue applying the @@ -686,7 +686,7 @@ the original mailbox, with authorship and commit log message each taken from the message containing each patch.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="public-repositories"></a>Public git repositories</h2></div></div></div><p>Another way to submit changes to a project is to tell the maintainer of that project to pull the changes from your repository using -<a href="git-pull.html" target="_top">git-pull(1)</a>. In the section "<a href="#getting-updates-with-git-pull" title="Getting updates with git-pull">Getting updates with git-pull</a>" we described this as a way to get +<a class="ulink" href="git-pull.html" target="_top">git-pull(1)</a>. In the section "<a class="link" href="#getting-updates-with-git-pull" title="Getting updates with git-pull">Getting updates with git-pull</a>" we described this as a way to get updates from the "main" repository, but it works just as well in the other direction.</p><p>If you and the maintainer both have accounts on the same machine, then you can just pull changes from each other's repositories directly; @@ -719,12 +719,12 @@ convenient.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="exporting-via-git"></a>Exporting a git repository via the git protocol</h3></div></div></div><p>This is the preferred method.</p><p>If someone else administers the server, they should tell you what directory to put the repository in, and what git:// URL it will appear at. You can then skip to the section -"<a href="#pushing-changes-to-a-public-repository" title="Pushing changes to a public repository">Pushing changes to a public repository</a>", below.</p><p>Otherwise, all you need to do is start <a href="git-daemon.html" target="_top">git-daemon(1)</a>; it will +"<a class="link" href="#pushing-changes-to-a-public-repository" title="Pushing changes to a public repository">Pushing changes to a public repository</a>", below.</p><p>Otherwise, all you need to do is start <a class="ulink" href="git-daemon.html" target="_top">git-daemon(1)</a>; it will listen on port 9418. By default, it will allow access to any directory that looks like a git directory and contains the magic file git-daemon-export-ok. Passing some directory paths as git-daemon arguments will further restrict the exports to those paths.</p><p>You can also run git-daemon as an inetd service; see the -<a href="git-daemon.html" target="_top">git-daemon(1)</a> man page for details. (See especially the +<a class="ulink" href="git-daemon.html" target="_top">git-daemon(1)</a> man page for details. (See especially the examples section.)</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="exporting-via-http"></a>Exporting a git repository via http</h3></div></div></div><p>The git protocol gives better performance and reliability, but on a host with a web server set up, http exports may be simpler to set up.</p><p>All you need to do is place the newly created bare git repository in a directory that is exported by the web server, and make some @@ -732,20 +732,20 @@ $ cd proj.git<br> $ git --bare update-server-info<br> $ chmod a+x hooks/post-update</p></div><p>(For an explanation of the last two lines, see -<a href="git-update-server-info.html" target="_top">git-update-server-info(1)</a> and <a href="githooks.html" target="_top">githooks(5)</a>.)</p><p>Advertise the URL of proj.git. Anybody else should then be able to +<a class="ulink" href="git-update-server-info.html" target="_top">git-update-server-info(1)</a> and <a class="ulink" href="githooks.html" target="_top">githooks(5)</a>.)</p><p>Advertise the URL of proj.git. Anybody else should then be able to clone or pull from that URL, for example with a command line like:</p><div class="literallayout"><p>$ git clone http://yourserver.com/~you/proj.git</p></div><p>(See also -<a href="howto/setup-git-server-over-http.txt" target="_top">setup-git-server-over-http</a> +<a class="ulink" href="howto/setup-git-server-over-http.txt" target="_top">setup-git-server-over-http</a> for a slightly more sophisticated setup using WebDAV which also allows pushing over http.)</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="pushing-changes-to-a-public-repository"></a>Pushing changes to a public repository</h3></div></div></div><p>Note that the two techniques outlined above (exporting via -<a href="#exporting-via-http" title="Exporting a git repository via http">http</a> or <a href="#exporting-via-git" title="Exporting a git repository via the git protocol">git</a>) allow other +<a class="link" href="#exporting-via-http" title="Exporting a git repository via http">http</a> or <a class="link" href="#exporting-via-git" title="Exporting a git repository via the git protocol">git</a>) allow other maintainers to fetch your latest changes, but they do not allow write access, which you will need to update the public repository with the -latest changes created in your private repository.</p><p>The simplest way to do this is using <a href="git-push.html" target="_top">git-push(1)</a> and ssh; to +latest changes created in your private repository.</p><p>The simplest way to do this is using <a class="ulink" href="git-push.html" target="_top">git-push(1)</a> and ssh; to update the remote branch named "master" with the latest state of your branch named "master", run</p><div class="literallayout"><p>$ git push ssh://yourserver.com/~you/proj.git master:master</p></div><p>or just</p><div class="literallayout"><p>$ git push ssh://yourserver.com/~you/proj.git master</p></div><p>As with git-fetch, git-push will complain if this does not result in a -<a href="#fast-forwards" title="Fast-forward merges">fast forward</a>; see the following section for details on +<a class="link" href="#fast-forwards" title="Fast-forward merges">fast forward</a>; see the following section for details on handling this case.</p><p>Note that the target of a "push" is normally a -<a href="#def_bare_repository">bare</a> repository. You can also push to a +<a class="link" href="#def_bare_repository">bare</a> repository. You can also push to a repository that has a checked-out working tree, but the working tree will not be updated by the push. This may lead to unexpected results if the branch you push to is the currently checked-out branch!</p><p>As with git-fetch, you may also set up configuration options to @@ -753,35 +753,35 @@ [remote "public-repo"]<br> url = ssh://yourserver.com/~you/proj.git<br> EOF</p></div><p>you should be able to perform the above push with just</p><div class="literallayout"><p>$ git push public-repo master</p></div><p>See the explanations of the remote.<name>.url, branch.<name>.remote, -and remote.<name>.push options in <a href="git-config.html" target="_top">git-config(1)</a> for -details.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="forcing-push"></a>What to do when a push fails</h3></div></div></div><p>If a push would not result in a <a href="#fast-forwards" title="Fast-forward merges">fast forward</a> of the +and remote.<name>.push options in <a class="ulink" href="git-config.html" target="_top">git-config(1)</a> for +details.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="forcing-push"></a>What to do when a push fails</h3></div></div></div><p>If a push would not result in a <a class="link" href="#fast-forwards" title="Fast-forward merges">fast forward</a> of the remote branch, then it will fail with an error like:</p><div class="literallayout"><p>error: remote 'refs/heads/master' is not an ancestor of<br> local 'refs/heads/master'.<br> Maybe you are not up-to-date and need to pull first?<br> error: failed to push to 'ssh://yourserver.com/~you/proj.git'</p></div><p>This can happen, for example, if you:</p><div class="itemizedlist"><ul type="disc"><li> -use <code class="literal">git reset —hard</code> to remove already-published commits, or +use <code class="literal">git-reset —hard</code> to remove already-published commits, or </li><li> -use <code class="literal">git commit —amend</code> to replace already-published commits - (as in <a href="#fixing-a-mistake-by-rewriting-history" title="Fixing a mistake by rewriting history">the section called “Fixing a mistake by rewriting history”</a>), or +use <code class="literal">git-commit —amend</code> to replace already-published commits + (as in <a class="xref" href="#fixing-a-mistake-by-rewriting-history" title="Fixing a mistake by rewriting history">the section called “Fixing a mistake by rewriting history”</a>), or </li><li> -use <code class="literal">git rebase</code> to rebase any already-published commits (as - in <a href="#using-git-rebase" title="Keeping a patch series up to date using git-rebase">the section called “Keeping a patch series up to date using git-rebase”</a>). +use <code class="literal">git-rebase</code> to rebase any already-published commits (as + in <a class="xref" href="#using-git-rebase" title="Keeping a patch series up to date using git-rebase">the section called “Keeping a patch series up to date using git-rebase”</a>). </li></ul></div><p>You may force git-push to perform the update anyway by preceding the branch name with a plus sign:</p><div class="literallayout"><p>$ git push ssh://yourserver.com/~you/proj.git +master</p></div><p>Normally whenever a branch head in a public repository is modified, it is modified to point to a descendant of the commit that it pointed to before. By forcing a push in this situation, you break that convention. -(See <a href="#problems-with-rewriting-history" title="Problems with rewriting history">the section called “Problems with rewriting history”</a>.)</p><p>Nevertheless, this is a common practice for people that need a simple +(See <a class="xref" href="#problems-with-rewriting-history" title="Problems with rewriting history">the section called “Problems with rewriting history”</a>.)</p><p>Nevertheless, this is a common practice for people that need a simple way to publish a work-in-progress patch series, and it is an acceptable compromise as long as you warn other developers that this is how you intend to manage the branch.</p><p>It's also possible for a push to fail in this way when other people have the right to push to the same repository. In that case, the correct solution is to retry the push after first updating your work by either a pull or a fetch followed by a rebase; see the -<a href="#setting-up-a-shared-repository" title="Setting up a shared repository">next section</a> and -<a href="gitcvs-migration.html" target="_top">gitcvs-migration(7)</a> for more.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="setting-up-a-shared-repository"></a>Setting up a shared repository</h3></div></div></div><p>Another way to collaborate is by using a model similar to that +<a class="link" href="#setting-up-a-shared-repository" title="Setting up a shared repository">next section</a> and +<a class="ulink" href="gitcvs-migration.html" target="_top">gitcvs-migration(7)</a> for more.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="setting-up-a-shared-repository"></a>Setting up a shared repository</h3></div></div></div><p>Another way to collaborate is by using a model similar to that commonly used in CVS, where several developers with special rights all push to and pull from a single shared repository. See -<a href="gitcvs-migration.html" target="_top">gitcvs-migration(7)</a> for instructions on how to +<a class="ulink" href="gitcvs-migration.html" target="_top">gitcvs-migration(7)</a> for instructions on how to set this up.</p><p>However, while there is nothing wrong with git's support for shared repositories, this mode of operation is not generally recommended, simply because the mode of collaboration that git supports—by @@ -819,29 +819,29 @@ containing a logical grouping of patches.</p><p>To set this up, first create your work tree by cloning Linus's public tree:</p><div class="literallayout"><p>$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work<br> $ cd work</p></div><p>Linus's tree will be stored in the remote branch named origin/master, -and can be updated using <a href="git-fetch.html" target="_top">git-fetch(1)</a>; you can track other -public trees using <a href="git-remote.html" target="_top">git-remote(1)</a> to set up a "remote" and -<a href="git-fetch.html" target="_top">git-fetch(1)</a> to keep them up-to-date; see -<a href="#repositories-and-branches" title="Chapter 1. Repositories and Branches">Chapter 1, <i>Repositories and Branches</i></a>.</p><p>Now create the branches in which you are going to work; these start out +and can be updated using <a class="ulink" href="git-fetch.html" target="_top">git-fetch(1)</a>; you can track other +public trees using <a class="ulink" href="git-remote.html" target="_top">git-remote(1)</a> to set up a "remote" and +<a class="ulink" href="git-fetch.html" target="_top">git-fetch(1)</a> to keep them up-to-date; see +<a class="xref" href="#repositories-and-branches" title="Chapter 1. Repositories and Branches">Chapter 1, <i>Repositories and Branches</i></a>.</p><p>Now create the branches in which you are going to work; these start out at the current tip of origin/master branch, and should be set up (using -the —track option to <a href="git-branch.html" target="_top">git-branch(1)</a>) to merge changes in from +the —track option to <a class="ulink" href="git-branch.html" target="_top">git-branch(1)</a>) to merge changes in from Linus by default.</p><div class="literallayout"><p>$ git branch --track test origin/master<br> -$ git branch --track release origin/master</p></div><p>These can be easily kept up to date using <a href="git-pull.html" target="_top">git-pull(1)</a>.</p><div class="literallayout"><p>$ git checkout test && git pull<br> +$ git branch --track release origin/master</p></div><p>These can be easily kept up to date using <a class="ulink" href="git-pull.html" target="_top">git-pull(1)</a>.</p><div class="literallayout"><p>$ git checkout test && git pull<br> $ git checkout release && git pull</p></div><p>Important note! If you have any local changes in these branches, then this merge will create a commit object in the history (with no local changes git will simply do a "Fast forward" merge). Many people dislike the "noise" that this creates in the Linux history, so you should avoid doing this capriciously in the "release" branch, as these noisy commits will become part of the permanent history when you ask Linus to pull -from the release branch.</p><p>A few configuration variables (see <a href="git-config.html" target="_top">git-config(1)</a>) can +from the release branch.</p><p>A few configuration variables (see <a class="ulink" href="git-config.html" target="_top">git-config(1)</a>) can make it easy to push both branches to your public tree. (See -<a href="#setting-up-a-public-repository" title="Setting up a public repository">the section called “Setting up a public repository”</a>.)</p><div class="literallayout"><p>$ cat >> .git/config <<EOF<br> +<a class="xref" href="#setting-up-a-public-repository" title="Setting up a public repository">the section called “Setting up a public repository”</a>.)</p><div class="literallayout"><p>$ cat >> .git/config <<EOF<br> [remote "mytree"]<br> url = master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git<br> push = release<br> push = test<br> EOF</p></div><p>Then you can push both the test and release trees using -<a href="git-push.html" target="_top">git-push(1)</a>:</p><div class="literallayout"><p>$ git push mytree</p></div><p>or push just one of the test and release branches using:</p><div class="literallayout"><p>$ git push mytree test</p></div><p>or</p><div class="literallayout"><p>$ git push mytree release</p></div><p>Now to apply some patches from the community. Think of a short +<a class="ulink" href="git-push.html" target="_top">git-push(1)</a>:</p><div class="literallayout"><p>$ git push mytree</p></div><p>or push just one of the test and release branches using:</p><div class="literallayout"><p>$ git push mytree test</p></div><p>or</p><div class="literallayout"><p>$ git push mytree release</p></div><p>Now to apply some patches from the community. Think of a short snappy name for a branch to hold this patch (or related group of patches), and create a new branch from the current tip of Linus's branch:</p><div class="literallayout"><p>$ git checkout -b speed-up-spinlocks origin</p></div><p>Now you apply the patch(es), run some tests, and commit the change(s). If @@ -854,7 +854,7 @@ means that the patches can be moved into the "release" tree in any order.</p><div class="literallayout"><p>$ git checkout release && git pull . speed-up-spinlocks</p></div><p>After a while, you will have a number of branches, and despite the well chosen names you picked for each of them, you may forget what they are for, or what status they are in. To get a reminder of what -changes are in a specific branch, use:</p><div class="literallayout"><p>$ git log linux..branchname | git-shortlog</p></div><p>To see whether it has already been merged into the test or release branches, +changes are in a specific branch, use:</p><div class="literallayout"><p>$ git log linux..branchname | git shortlog</p></div><p>To see whether it has already been merged into the test or release branches, use:</p><div class="literallayout"><p>$ git log test..branchname</p></div><p>or</p><div class="literallayout"><p>$ git log release..branchname</p></div><p>(If this branch has not yet been merged, you will see some log entries. If it has been merged, then there will be no output.)</p><p>Once a patch completes the great cycle (moving from test to release, then pulled by Linus, and finally coming back into your local @@ -999,43 +999,43 @@ \ \ a--b--c--m <-- mywork</pre><p>However, if you prefer to keep the history in mywork a simple series of commits without any merges, you may instead choose to use -<a href="git-rebase.html" target="_top">git-rebase(1)</a>:</p><div class="literallayout"><p>$ git checkout mywork<br> +<a class="ulink" href="git-rebase.html" target="_top">git-rebase(1)</a>:</p><div class="literallayout"><p>$ git checkout mywork<br> $ git rebase origin</p></div><p>This will remove each of your commits from mywork, temporarily saving them as patches (in a directory named ".dotest"), update mywork to point at the latest version of origin, then apply each of the saved patches to the new mywork. The result will look like:</p><pre class="literallayout"> o--o--O--o--o--o <-- origin \ a'--b'--c' <-- mywork</pre><p>In the process, it may discover conflicts. In that case it will stop -and allow you to fix the conflicts; after fixing conflicts, use "git -add" to update the index with those contents, and then, instead of +and allow you to fix the conflicts; after fixing conflicts, use "git-add" +to update the index with those contents, and then, instead of running git-commit, just run</p><div class="literallayout"><p>$ git rebase --continue</p></div><p>and git will continue applying the rest of the patches.</p><p>At any point you may use the <code class="literal">—abort</code> option to abort this process and -return mywork to the state it had before you started the rebase:</p><div class="literallayout"><p>$ git rebase --abort</p></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="rewriting-one-commit"></a>Rewriting a single commit</h2></div></div></div><p>We saw in <a href="#fixing-a-mistake-by-rewriting-history" title="Fixing a mistake by rewriting history">the section called “Fixing a mistake by rewriting history”</a> that you can replace the +return mywork to the state it had before you started the rebase:</p><div class="literallayout"><p>$ git rebase --abort</p></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="rewriting-one-commit"></a>Rewriting a single commit</h2></div></div></div><p>We saw in <a class="xref" href="#fixing-a-mistake-by-rewriting-history" title="Fixing a mistake by rewriting history">the section called “Fixing a mistake by rewriting history”</a> that you can replace the most recent commit using</p><div class="literallayout"><p>$ git commit --amend</p></div><p>which will replace the old commit by a new commit incorporating your -changes, giving you a chance to edit the old commit message first.</p><p>You can also use a combination of this and <a href="git-rebase.html" target="_top">git-rebase(1)</a> to +changes, giving you a chance to edit the old commit message first.</p><p>You can also use a combination of this and <a class="ulink" href="git-rebase.html" target="_top">git-rebase(1)</a> to replace a commit further back in your history and recreate the intervening changes on top of it. First, tag the problematic commit with</p><div class="literallayout"><p>$ git tag bad mywork~5</p></div><p>(Either gitk or git-log may be useful for finding the commit.)</p><p>Then check out that commit, edit it, and rebase the rest of the series on top of it (note that we could check out the commit on a temporary -branch, but instead we're using a <a href="#detached-head" title="Examining an old version without creating a new branch">detached head</a>):</p><div class="literallayout"><p>$ git checkout bad<br> +branch, but instead we're using a <a class="link" href="#detached-head" title="Examining an old version without creating a new branch">detached head</a>):</p><div class="literallayout"><p>$ git checkout bad<br> $ # make changes here and update the index<br> $ git commit --amend<br> $ git rebase --onto HEAD bad mywork</p></div><p>When you're done, you'll be left with mywork checked out, with the top patches on mywork reapplied on top of your modified commit. You can then clean up with</p><div class="literallayout"><p>$ git tag -d bad</p></div><p>Note that the immutable nature of git history means that you haven't really "modified" existing commits; instead, you have replaced the old commits with -new commits having new object names.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="reordering-patch-series"></a>Reordering or selecting from a patch series</h2></div></div></div><p>Given one existing commit, the <a href="git-cherry-pick.html" target="_top">git-cherry-pick(1)</a> command +new commits having new object names.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="reordering-patch-series"></a>Reordering or selecting from a patch series</h2></div></div></div><p>Given one existing commit, the <a class="ulink" href="git-cherry-pick.html" target="_top">git-cherry-pick(1)</a> command allows you to apply the change introduced by that commit and create a new commit that records it. So, for example, if "mywork" points to a series of patches on top of "origin", you might do something like:</p><div class="literallayout"><p>$ git checkout -b mywork-new origin<br> $ gitk origin..mywork &</p></div><p>and browse through the list of patches in the mywork branch using gitk, applying them (possibly in a different order) to mywork-new using cherry-pick, and possibly modifying them as you go using <code class="literal">commit —amend</code>. -The <a href="git-gui.html" target="_top">git-gui(1)</a> command may also help as it allows you to +The <a class="ulink" href="git-gui.html" target="_top">git-gui(1)</a> command may also help as it allows you to individually select diff hunks for inclusion in the index (by right-clicking on the diff hunk and choosing "Stage Hunk for Commit").</p><p>Another technique is to use git-format-patch to create a series of patches, then reset the state to before the patches:</p><div class="literallayout"><p>$ git format-patch origin<br> $ git reset --hard origin</p></div><p>Then modify, reorder, or eliminate patches as preferred before applying -them again with <a href="git-am.html" target="_top">git-am(1)</a>.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="patch-series-tools"></a>Other tools</h2></div></div></div><p>There are numerous other tools, such as StGIT, which exist for the +them again with <a class="ulink" href="git-am.html" target="_top">git-am(1)</a>.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="patch-series-tools"></a>Other tools</h2></div></div></div><p>There are numerous other tools, such as StGIT, which exist for the purpose of maintaining a patch series. These are outside of the scope of this manual.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="problems-with-rewriting-history"></a>Problems with rewriting history</h2></div></div></div><p>The primary problem with rewriting the history of a branch has to do with merging. Suppose somebody fetches your branch and merges it into @@ -1058,7 +1058,7 @@ and it may be useful for others to be able to fetch those branches in order to examine or test them, but they should not attempt to pull such branches into their own work.</p><p>For true distributed development that supports proper merging, -published branches should never be rewritten.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="bisect-merges"></a>Why bisecting merge commits can be harder than bisecting linear history</h2></div></div></div><p>The <a href="git-bisect.html" target="_top">git-bisect(1)</a> command correctly handles history that +published branches should never be rewritten.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="bisect-merges"></a>Why bisecting merge commits can be harder than bisecting linear history</h2></div></div></div><p>The <a class="ulink" href="git-bisect.html" target="_top">git-bisect(1)</a> command correctly handles history that includes merge commits. However, when the commit that it finds is a merge commit, the user may need to work harder than usual to figure out why that commit introduced a problem.</p><p>Imagine this history:</p><pre class="literallayout"> ---Z---o---X---...---o---A---C---D @@ -1077,7 +1077,7 @@ on the lower line of development have not been converted to the new semantics introduced on the upper line of development. So if all you know is that D is bad, that Z is good, and that -<a href="git-bisect.html" target="_top">git-bisect(1)</a> identifies C as the culprit, how will you +<a class="ulink" href="git-bisect.html" target="_top">git-bisect(1)</a> identifies C as the culprit, how will you figure out that the problem is due to this change in semantics?</p><p>When the result of a git-bisect is a non-merge commit, you should normally be able to discover the problem by examining just that commit. Developers can make this easy by breaking their changes into small @@ -1092,7 +1092,7 @@ and understanding why Y* was broken would probably be easier.</p><p>Partly for this reason, many experienced git users, even when working on an otherwise merge-heavy project, keep the history linear by rebasing against the latest upstream version before -publishing.</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="advanced-branch-management"></a>Chapter 6. Advanced branch management</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git-fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote branches</a></span></dt></dl></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="fetching-individual-branches"></a>Fetching individual branches</h2></div></div></div><p>Instead of using <a href="git-remote.html" target="_top">git-remote(1)</a>, you can also choose just +publishing.</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="advanced-branch-management"></a>Chapter 6. Advanced branch management</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git-fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote branches</a></span></dt></dl></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="fetching-individual-branches"></a>Fetching individual branches</h2></div></div></div><p>Instead of using <a class="ulink" href="git-remote.html" target="_top">git-remote(1)</a>, you can also choose just to update one branch at a time, and to store it locally under an arbitrary name:</p><div class="literallayout"><p>$ git fetch origin todo:my-todo-work</p></div><p>The first argument, "origin", just tells git to fetch from the repository you originally cloned from. The second argument tells git @@ -1100,19 +1100,19 @@ store it locally under the name refs/heads/my-todo-work.</p><p>You can also fetch branches from other repositories; so</p><div class="literallayout"><p>$ git fetch git://example.com/proj.git master:example-master</p></div><p>will create a new branch named "example-master" and store in it the branch named "master" from the repository at the given URL. If you already have a branch named example-master, it will attempt to -<a href="#fast-forwards" title="Fast-forward merges">fast-forward</a> to the commit given by example.com's -master branch. In more detail:</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="fetch-fast-forwards"></a>git fetch and fast-forwards</h2></div></div></div><p>In the previous example, when updating an existing branch, "git -fetch" checks to make sure that the most recent commit on the remote +<a class="link" href="#fast-forwards" title="Fast-forward merges">fast-forward</a> to the commit given by example.com's +master branch. In more detail:</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="fetch-fast-forwards"></a>git fetch and fast-forwards</h2></div></div></div><p>In the previous example, when updating an existing branch, "git-fetch" +checks to make sure that the most recent commit on the remote branch is a descendant of the most recent commit on your copy of the branch before updating your copy of the branch to point at the new -commit. Git calls this process a <a href="#fast-forwards" title="Fast-forward merges">fast forward</a>.</p><p>A fast forward looks something like this:</p><pre class="literallayout"> o--o--o--o <-- old head of the branch +commit. Git calls this process a <a class="link" href="#fast-forwards" title="Fast-forward merges">fast forward</a>.</p><p>A fast forward looks something like this:</p><pre class="literallayout"> o--o--o--o <-- old head of the branch \ o--o--o <-- new head of the branch</pre><p>In some cases it is possible that the new head will <span class="strong"><strong>not</strong></span> actually be a descendant of the old head. For example, the developer may have realized she made a serious mistake, and decided to backtrack, resulting in a situation like:</p><pre class="literallayout"> o--o--o--o--a--b <-- old head of the branch \ - o--o--o <-- new head of the branch</pre><p>In this case, "git fetch" will fail, and print out a warning.</p><p>In that case, you can still force git to update to the new head, as + o--o--o <-- new head of the branch</pre><p>In this case, "git-fetch" will fail, and print out a warning.</p><p>In that case, you can still force git to update to the new head, as described in the following section. However, note that in the situation above this may mean losing the commits labeled "a" and "b", unless you've already created a reference of your own pointing to @@ -1122,7 +1122,7 @@ may be lost, as we saw in the previous section.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="remote-branch-configuration"></a>Configuring remote branches</h2></div></div></div><p>We saw above that "origin" is just a shortcut to refer to the repository that you originally cloned from. This information is stored in git configuration variables, which you can see using -<a href="git-config.html" target="_top">git-config(1)</a>:</p><div class="literallayout"><p>$ git config -l<br> +<a class="ulink" href="git-config.html" target="_top">git-config(1)</a>:</p><div class="literallayout"><p>$ git config -l<br> core.repositoryformatversion=0<br> core.filemode=true<br> core.logallrefupdates=true<br> @@ -1137,10 +1137,10 @@ $ git fetch example</p></div><p>You can also add a "+" to force the update each time:</p><div class="literallayout"><p>$ git config remote.example.fetch +master:ref/remotes/example/master</p></div><p>Don't do this unless you're sure you won't mind "git-fetch" possibly throwing away commits on mybranch.</p><p>Also note that all of the above configuration can be performed by directly editing the file .git/config instead of using -<a href="git-config.html" target="_top">git-config(1)</a>.</p><p>See <a href="git-config.html" target="_top">git-config(1)</a> for more details on the configuration +<a class="ulink" href="git-config.html" target="_top">git-config(1)</a>.</p><p>See <a class="ulink" href="git-config.html" target="_top">git-config(1)</a> for more details on the configuration options mentioned above.</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="git-concepts"></a>Chapter 7. Git concepts</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></div><p>Git is built on a small number of simple but powerful ideas. While it is possible to get things done without understanding them, you will find -git much more intuitive if you do.</p><p>We start with the most important, the <a href="#def_object_database">object database</a> and the <a href="#def_index">index</a>.</p><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="the-object-database"></a>The Object Database</h2></div></div></div><p>We already saw in <a href="#understanding-commits" title="Understanding History: Commits">the section called “Understanding History: Commits”</a> that all commits are stored +git much more intuitive if you do.</p><p>We start with the most important, the <a class="link" href="#def_object_database">object database</a> and the <a class="link" href="#def_index">index</a>.</p><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="the-object-database"></a>The Object Database</h2></div></div></div><p>We already saw in <a class="xref" href="#understanding-commits" title="Understanding History: Commits">the section called “Understanding History: Commits”</a> that all commits are stored under a 40-digit "object name". In fact, all the information needed to represent the history of a project is stored in objects with such names. In each case the name is calculated by taking the SHA1 hash of the @@ -1157,29 +1157,29 @@ </li><li> Git can detect errors when it reads an object, by checking that the object's name is still the SHA1 hash of its contents. -</li></ul></div><p>(See <a href="#object-details" title="Object storage format">the section called “Object storage format”</a> for the details of the object formatting and +</li></ul></div><p>(See <a class="xref" href="#object-details" title="Object storage format">the section called “Object storage format”</a> for the details of the object formatting and SHA1 calculation.)</p><p>There are four different types of objects: "blob", "tree", "commit", and "tag".</p><div class="itemizedlist"><ul type="disc"><li> -A <a href="#def_blob_object">"blob" object</a> is used to store file data. +A <a class="link" href="#def_blob_object">"blob" object</a> is used to store file data. </li><li> -A <a href="#def_tree_object">"tree" object</a> is an object that ties one or more +A <a class="link" href="#def_tree_object">"tree" object</a> is an object that ties one or more "blob" objects into a directory structure. In addition, a tree object can refer to other tree objects, thus creating a directory hierarchy. </li><li> -A <a href="#def_commit_object">"commit" object</a> ties such directory hierarchies - together into a <a href="#def_DAG">directed acyclic graph</a> of revisions—each +A <a class="link" href="#def_commit_object">"commit" object</a> ties such directory hierarchies + together into a <a class="link" href="#def_DAG">directed acyclic graph</a> of revisions—each commit contains the object name of exactly one tree designating the directory hierarchy at the time of the commit. In addition, a commit refers to "parent" commit objects that describe the history of how we arrived at that directory hierarchy. </li><li> -A <a href="#def_tag_object">"tag" object</a> symbolically identifies and can be +A <a class="link" href="#def_tag_object">"tag" object</a> symbolically identifies and can be used to sign other objects. It contains the object name and type of another object, a symbolic name (of course!) and, optionally, a signature. </li></ul></div><p>The object types in some more detail:</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="commit-object"></a>Commit Object</h3></div></div></div><p>The "commit" object links a physical state of a tree with a description of how we got there and why. Use the —pretty=raw option to -<a href="git-show.html" target="_top">git-show(1)</a> or <a href="git-log.html" target="_top">git-log(1)</a> to examine your favorite +<a class="ulink" href="git-show.html" target="_top">git-show(1)</a> or <a class="ulink" href="git-log.html" target="_top">git-log(1)</a> to examine your favorite commit:</p><div class="literallayout"><p>$ git show -s --pretty=raw 2be7fcb476<br> commit 2be7fcb4764f2dbcee52635b91fedb1b3dcf7ab4<br> tree fb3a8bdd0ceddd019615af4d57a53f43d8cee2bf<br> @@ -1216,10 +1216,10 @@ its parents. In particular, git does not attempt to record file renames explicitly, though it can identify cases where the existence of the same file data at changing paths suggests a rename. (See, for example, the --M option to <a href="git-diff.html" target="_top">git-diff(1)</a>).</p><p>A commit is usually created by <a href="git-commit.html" target="_top">git-commit(1)</a>, which creates a +-M option to <a class="ulink" href="git-diff.html" target="_top">git-diff(1)</a>).</p><p>A commit is usually created by <a class="ulink" href="git-commit.html" target="_top">git-commit(1)</a>, which creates a commit whose parent is normally the current HEAD, and whose tree is -taken from the content currently stored in the index.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="tree-object"></a>Tree Object</h3></div></div></div><p>The ever-versatile <a href="git-show.html" target="_top">git-show(1)</a> command can also be used to -examine tree objects, but <a href="git-ls-tree.html" target="_top">git-ls-tree(1)</a> will give you more +taken from the content currently stored in the index.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="tree-object"></a>Tree Object</h3></div></div></div><p>The ever-versatile <a class="ulink" href="git-show.html" target="_top">git-show(1)</a> command can also be used to +examine tree objects, but <a class="ulink" href="git-ls-tree.html" target="_top">git-ls-tree(1)</a> will give you more details:</p><div class="literallayout"><p>$ git ls-tree fb3a8bdd0ce<br> 100644 blob 63c918c667fa005ff12ad89437f2fdc80926e21c .gitignore<br> 100644 blob 5529b198e8d14decbe4ad99db3f7fb632de0439d .mailmap<br> @@ -1239,8 +1239,8 @@ are identical. This allows git to quickly determine the differences between two related tree objects, since it can ignore any entries with identical object names.</p><p>(Note: in the presence of submodules, trees may also have commits as -entries. See <a href="#submodules" title="Chapter 8. Submodules">Chapter 8, <i>Submodules</i></a> for documentation.)</p><p>Note that the files all have mode 644 or 755: git actually only pays -attention to the executable bit.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="blob-object"></a>Blob Object</h3></div></div></div><p>You can use <a href="git-show.html" target="_top">git-show(1)</a> to examine the contents of a blob; take, +entries. See <a class="xref" href="#submodules" title="Chapter 8. Submodules">Chapter 8, <i>Submodules</i></a> for documentation.)</p><p>Note that the files all have mode 644 or 755: git actually only pays +attention to the executable bit.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="blob-object"></a>Blob Object</h3></div></div></div><p>You can use <a class="ulink" href="git-show.html" target="_top">git-show(1)</a> to examine the contents of a blob; take, for example, the blob in the entry for "COPYING" from the tree above:</p><div class="literallayout"><p>$ git show 6ff87c4664<br> <br> Note that the only valid version of the GPL as far as this project<br> @@ -1252,7 +1252,7 @@ have the same contents, they will share the same blob object. The object is totally independent of its location in the directory tree, and renaming a file does not change the object that file is associated with.</p><p>Note that any tree or blob object can be examined using -<a href="git-show.html" target="_top">git-show(1)</a> with the <revision>:<path> syntax. This can +<a class="ulink" href="git-show.html" target="_top">git-show(1)</a> with the <revision>:<path> syntax. This can sometimes be useful for browsing the contents of a tree that is not currently checked out.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="trust"></a>Trust</h3></div></div></div><p>If you receive the SHA1 name of a blob from one source, and its contents from another (possibly untrusted) source, you can still trust that those @@ -1272,7 +1272,7 @@ of the top commit, and digitally sign that email using something like GPG/PGP.</p><p>To assist in this, git also provides the tag object…</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="tag-object"></a>Tag Object</h3></div></div></div><p>A tag object contains an object, object type, tag name, the name of the person ("tagger") who created the tag, and a message, which may contain -a signature, as can be seen using the <a href="git-cat-file.html" target="_top">git-cat-file(1)</a>:</p><div class="literallayout"><p>$ git cat-file tag v1.5.0<br> +a signature, as can be seen using the <a class="ulink" href="git-cat-file.html" target="_top">git-cat-file(1)</a>:</p><div class="literallayout"><p>$ git cat-file tag v1.5.0<br> object 437b1b20df4b356c9342dac8d38849f24ef44f27<br> type commit<br> tag v1.5.0<br> @@ -1285,8 +1285,8 @@ iD8DBQBF0lGqwMbZpPMRm5oRAuRiAJ9ohBLd7s2kqjkKlq1qqC57SbnmzQCdG4ui<br> nLE/L9aUXdWeTFPron96DLA=<br> =2E+0<br> ------END PGP SIGNATURE-----</p></div><p>See the <a href="git-tag.html" target="_top">git-tag(1)</a> command to learn how to create and verify tag -objects. (Note that <a href="git-tag.html" target="_top">git-tag(1)</a> can also be used to create +-----END PGP SIGNATURE-----</p></div><p>See the <a class="ulink" href="git-tag.html" target="_top">git-tag(1)</a> command to learn how to create and verify tag +objects. (Note that <a class="ulink" href="git-tag.html" target="_top">git-tag(1)</a> can also be used to create "lightweight tags", which are not tag objects at all, but just simple references whose names begin with "refs/tags/").</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="pack-files"></a>How git stores objects efficiently: pack files</h3></div></div></div><p>Newly created objects are initially created in a file named after the object's SHA1 hash (stored in .git/objects).</p><p>Unfortunately this system becomes inefficient once a project has a @@ -1296,7 +1296,7 @@ those "loose" objects.</p><p>You can save space and make git faster by moving these loose objects in to a "pack file", which stores a group of objects in an efficient compressed format; the details of how pack files are formatted can be -found in <a href="technical/pack-format.txt" target="_top">technical/pack-format.txt</a>.</p><p>To put the loose objects into a pack, just run git repack:</p><div class="literallayout"><p>$ git repack<br> +found in <a class="ulink" href="technical/pack-format.txt" target="_top">technical/pack-format.txt</a>.</p><p>To put the loose objects into a pack, just run git repack:</p><div class="literallayout"><p>$ git repack<br> Generating pack...<br> Done counting 6020 objects.<br> Deltifying 6020 objects.<br> @@ -1306,18 +1306,18 @@ Total 6020, written 6020 (delta 4070), reused 0 (delta 0)<br> Pack pack-3e54ad29d5b2e05838c75df582c65257b8d08e1c created.</p></div><p>You can then run</p><div class="literallayout"><p>$ git prune</p></div><p>to remove any of the "loose" objects that are now contained in the pack. This will also remove any unreferenced objects (which may be -created when, for example, you use "git reset" to remove a commit). +created when, for example, you use "git-reset" to remove a commit). You can verify that the loose objects are gone by looking at the .git/objects directory or by running</p><div class="literallayout"><p>$ git count-objects<br> 0 objects, 0 kilobytes</p></div><p>Although the object files are gone, any commands that refer to those -objects will work exactly as they did before.</p><p>The <a href="git-gc.html" target="_top">git-gc(1)</a> command performs packing, pruning, and more for -you, so is normally the only high-level command you need.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="dangling-objects"></a>Dangling objects</h3></div></div></div><p>The <a href="git-fsck.html" target="_top">git-fsck(1)</a> command will sometimes complain about dangling +objects will work exactly as they did before.</p><p>The <a class="ulink" href="git-gc.html" target="_top">git-gc(1)</a> command performs packing, pruning, and more for +you, so is normally the only high-level command you need.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="dangling-objects"></a>Dangling objects</h3></div></div></div><p>The <a class="ulink" href="git-fsck.html" target="_top">git-fsck(1)</a> command will sometimes complain about dangling objects. They are not a problem.</p><p>The most common cause of dangling objects is that you've rebased a branch, or you have pulled from somebody else who rebased a branch—see -<a href="#cleaning-up-history" title="Chapter 5. Rewriting history and maintaining patch series">Chapter 5, <i>Rewriting history and maintaining patch series</i></a>. In that case, the old head of the original +<a class="xref" href="#cleaning-up-history" title="Chapter 5. Rewriting history and maintaining patch series">Chapter 5, <i>Rewriting history and maintaining patch series</i></a>. In that case, the old head of the original branch still exists, as does everything it pointed to. The branch pointer itself just doesn't, since you replaced it with another one.</p><p>There are also other situations that cause dangling objects. For -example, a "dangling blob" may arise because you did a "git add" of a +example, a "dangling blob" may arise because you did a "git-add" of a file, but then, before you actually committed it and made it part of the bigger picture, you changed something else in that file and committed that <span class="strong"><strong>updated</strong></span> thing—the old state that you added originally ends up @@ -1341,8 +1341,8 @@ almost always the result of either being a half-way mergebase (the blob will often even have the conflict markers from a merge in it, if you have had conflicting merges that you fixed up by hand), or simply -because you interrupted a "git fetch" with ^C or something like that, -leaving _some_ of the new objects in the object database, but just +because you interrupted a "git-fetch" with ^C or something like that, +leaving <span class="emphasis"><em>some</em></span> of the new objects in the object database, but just dangling and useless.</p><p>Anyway, once you are sure that you're not interested in any dangling state, you can just prune all unreachable objects:</p><div class="literallayout"><p>$ git prune</p></div><p>and they'll be gone. But you should only run "git prune" on a quiescent repository—it's kind of like doing a filesystem fsck recovery: you @@ -1361,7 +1361,7 @@ in case you corrupt things even more in the process.</p><p>We'll assume that the problem is a single missing or corrupted blob, which is sometimes a solvable problem. (Recovering missing trees and especially commits is <span class="strong"><strong>much</strong></span> harder).</p><p>Before starting, verify that there is corruption, and figure out where -it is with <a href="git-fsck.html" target="_top">git-fsck(1)</a>; this may be time-consuming.</p><p>Assume the output looks like this:</p><div class="literallayout"><p>$ git fsck --full<br> +it is with <a class="ulink" href="git-fsck.html" target="_top">git-fsck(1)</a>; this may be time-consuming.</p><p>Assume the output looks like this:</p><div class="literallayout"><p>$ git fsck --full<br> broken link from tree 2d9263c6d23595e7cb2a21e5ebbb53655278dff8<br> to blob 4b9458b3786228369c63936db65827de3cc06200<br> missing blob 4b9458b3786228369c63936db65827de3cc06200</p></div><p>(Typically there will be some "dangling object" messages too, but they @@ -1369,7 +1369,7 @@ points to it. If you could find just one copy of that missing blob object, possibly in some other repository, you could move it into .git/objects/4b/9458b3… and be done. Suppose you can't. You can -still examine the tree that pointed to it with <a href="git-ls-tree.html" target="_top">git-ls-tree(1)</a>, +still examine the tree that pointed to it with <a class="ulink" href="git-ls-tree.html" target="_top">git-ls-tree(1)</a>, which might output something like:</p><div class="literallayout"><p>$ git ls-tree 2d9263c6d23595e7cb2a21e5ebbb53655278dff8<br> 100644 blob 8d14531846b95bfa3564b58ccfb7913a034323b8 .gitignore<br> 100644 blob ebf9bf84da0aab5ed944264a5db2a65fe3a3e883 .mailmap<br> @@ -1381,7 +1381,7 @@ say it's in "somedirectory". If you're lucky the missing copy might be the same as the copy you have checked out in your working tree at "somedirectory/myfile"; you can test whether that's right with -<a href="git-hash-object.html" target="_top">git-hash-object(1)</a>:</p><div class="literallayout"><p>$ git hash-object -w somedirectory/myfile</p></div><p>which will create and store a blob object with the contents of +<a class="ulink" href="git-hash-object.html" target="_top">git-hash-object(1)</a>:</p><div class="literallayout"><p>$ git hash-object -w somedirectory/myfile</p></div><p>which will create and store a blob object with the contents of somedirectory/myfile, and output the sha1 of that object. if you're extremely lucky it might be 4b9458b3786228369c63936db65827de3cc06200, in which case you've guessed right, and the corruption is fixed!</p><p>Otherwise, you need more information. How do you tell which version of @@ -1405,7 +1405,7 @@ whole thing. It's up to you - git does <span class="strong"><strong>have</strong></span> a lot of information, it is just missing one particular blob version.</p></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="the-index"></a>The index</h2></div></div></div><p>The index is a binary file (generally kept in .git/index) containing a sorted list of path names, each with permissions and the SHA1 of a blob -object; <a href="git-ls-files.html" target="_top">git-ls-files(1)</a> can show you the contents of the index:</p><div class="literallayout"><p>$ git ls-files --stage<br> +object; <a class="ulink" href="git-ls-files.html" target="_top">git-ls-files(1)</a> can show you the contents of the index:</p><div class="literallayout"><p>$ git ls-files --stage<br> 100644 63c918c667fa005ff12ad89437f2fdc80926e21c 0 .gitignore<br> 100644 5529b198e8d14decbe4ad99db3f7fb632de0439d 0 .mailmap<br> 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0 COPYING<br> @@ -1419,7 +1419,7 @@ properties:</p><div class="orderedlist"><ol type="1"><li><p> The index contains all the information necessary to generate a single (uniquely determined) tree object. -</p><p>For example, running <a href="git-commit.html" target="_top">git-commit(1)</a> generates this tree object +</p><p>For example, running <a class="ulink" href="git-commit.html" target="_top">git-commit(1)</a> generates this tree object from the index, stores it in the object database, and uses it as the tree object associated with the new commit.</p></li><li><p> The index enables fast comparisons between the tree object it defines @@ -1434,13 +1434,13 @@ between different tree objects, allowing each pathname to be associated with sufficient information about the trees involved that you can create a three-way merge between them. -</p><p>We saw in <a href="#conflict-resolution" title="Getting conflict-resolution help during a merge">the section called “Getting conflict-resolution help during a merge”</a> that during a merge the index can +</p><p>We saw in <a class="xref" href="#conflict-resolution" title="Getting conflict-resolution help during a merge">the section called “Getting conflict-resolution help during a merge”</a> that during a merge the index can store multiple versions of a single file (called "stages"). The third -column in the <a href="git-ls-files.html" target="_top">git-ls-files(1)</a> output above is the stage +column in the <a class="ulink" href="git-ls-files.html" target="_top">git-ls-files(1)</a> output above is the stage number, and will take on values other than 0 for files with merge conflicts.</p></li></ol></div><p>The index is thus a sort of temporary staging area, which is filled with a tree which you are in the process of working on.</p><p>If you blow the index away entirely, you generally haven't lost any -information as long as you have the name of the tree that it described.</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="submodules"></a>Chapter 8. Submodules</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#id280263">Pitfalls with submodules</a></span></dt></dl></div><p>Large projects are often composed of smaller, self-contained modules. For +information as long as you have the name of the tree that it described.</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="submodules"></a>Chapter 8. Submodules</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></div><p>Large projects are often composed of smaller, self-contained modules. For example, an embedded Linux distribution's source tree would include every piece of software in the distribution with some local modifications; a movie player might need to build against a specific, known-working version of a @@ -1465,7 +1465,7 @@ commit ID, so other developers who clone the containing project ("superproject") can easily clone all the submodules at the same revision. Partial checkouts of the superproject are possible: you can tell Git to -clone none, some or all of the submodules.</p><p>The <a href="git-submodule.html" target="_top">git-submodule(1)</a> command is available since Git 1.5.3. Users +clone none, some or all of the submodules.</p><p>The <a class="ulink" href="git-submodule.html" target="_top">git-submodule(1)</a> command is available since Git 1.5.3. Users with Git 1.5.2 can look up the submodule commits in the repository and manually check them out; earlier versions won't recognize the submodules at all.</p><p>To see how submodule support works, create (for example) four example @@ -1491,7 +1491,7 @@ It clones the submodule under the current directory and by default checks out the master branch. </li><li> -It adds the submodule's clone path to the <a href="gitmodules.html" target="_top">gitmodules(5)</a> file and +It adds the submodule's clone path to the <a class="ulink" href="gitmodules.html" target="_top">gitmodules(5)</a> file and adds this file to the index, ready to be committed. </li><li> It adds the submodule's current commit ID to the index, ready to be @@ -1534,7 +1534,7 @@ $ git add a<br> $ git commit -m "Updated submodule a."<br> $ git push</p></div><p>You have to run <code class="literal">git submodule update</code> after <code class="literal">git pull</code> if you want to update -submodules, too.</p><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id280263"></a>Pitfalls with submodules</h2></div></div></div><p>Always publish the submodule change before publishing the change to the +submodules, too.</p><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="_pitfalls_with_submodules"></a>Pitfalls with submodules</h2></div></div></div><p>Always publish the submodule change before publishing the change to the superproject that references it. If you forget to publish the submodule change, others won't be able to clone the repository:</p><div class="literallayout"><p>$ cd ~/git/super/a<br> $ echo i added another line to this file >> a.txt<br> @@ -1563,21 +1563,21 @@ module a</p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>The changes are still visible in the submodule's reflog.</p></div><p>This is not the case if you did not commit your changes.</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="low-level-operations"></a>Chapter 9. Low-level git operations</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory -> index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index -> object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database -> index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index -> working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></div><p>Many of the higher-level commands were originally implemented as shell scripts using a smaller core of low-level git commands. These can still be useful when doing unusual things with git, or just as a way to -understand its inner workings.</p><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="object-manipulation"></a>Object access and manipulation</h2></div></div></div><p>The <a href="git-cat-file.html" target="_top">git-cat-file(1)</a> command can show the contents of any object, -though the higher-level <a href="git-show.html" target="_top">git-show(1)</a> is usually more useful.</p><p>The <a href="git-commit-tree.html" target="_top">git-commit-tree(1)</a> command allows constructing commits with -arbitrary parents and trees.</p><p>A tree can be created with <a href="git-write-tree.html" target="_top">git-write-tree(1)</a> and its data can be -accessed by <a href="git-ls-tree.html" target="_top">git-ls-tree(1)</a>. Two trees can be compared with -<a href="git-diff-tree.html" target="_top">git-diff-tree(1)</a>.</p><p>A tag is created with <a href="git-mktag.html" target="_top">git-mktag(1)</a>, and the signature can be -verified by <a href="git-verify-tag.html" target="_top">git-verify-tag(1)</a>, though it is normally simpler to -use <a href="git-tag.html" target="_top">git-tag(1)</a> for both.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="the-workflow"></a>The Workflow</h2></div></div></div><p>High-level operations such as <a href="git-commit.html" target="_top">git-commit(1)</a>, -<a href="git-checkout.html" target="_top">git-checkout(1)</a> and <a href="git-reset.html" target="_top">git-reset(1)</a> work by moving data +understand its inner workings.</p><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="object-manipulation"></a>Object access and manipulation</h2></div></div></div><p>The <a class="ulink" href="git-cat-file.html" target="_top">git-cat-file(1)</a> command can show the contents of any object, +though the higher-level <a class="ulink" href="git-show.html" target="_top">git-show(1)</a> is usually more useful.</p><p>The <a class="ulink" href="git-commit-tree.html" target="_top">git-commit-tree(1)</a> command allows constructing commits with +arbitrary parents and trees.</p><p>A tree can be created with <a class="ulink" href="git-write-tree.html" target="_top">git-write-tree(1)</a> and its data can be +accessed by <a class="ulink" href="git-ls-tree.html" target="_top">git-ls-tree(1)</a>. Two trees can be compared with +<a class="ulink" href="git-diff-tree.html" target="_top">git-diff-tree(1)</a>.</p><p>A tag is created with <a class="ulink" href="git-mktag.html" target="_top">git-mktag(1)</a>, and the signature can be +verified by <a class="ulink" href="git-verify-tag.html" target="_top">git-verify-tag(1)</a>, though it is normally simpler to +use <a class="ulink" href="git-tag.html" target="_top">git-tag(1)</a> for both.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="the-workflow"></a>The Workflow</h2></div></div></div><p>High-level operations such as <a class="ulink" href="git-commit.html" target="_top">git-commit(1)</a>, +<a class="ulink" href="git-checkout.html" target="_top">git-checkout(1)</a> and <a class="ulink" href="git-reset.html" target="_top">git-reset(1)</a> work by moving data between the working tree, the index, and the object database. Git provides low-level operations which perform each of these steps individually.</p><p>Generally, all "git" operations work on the index file. Some operations work <span class="strong"><strong>purely</strong></span> on the index file (showing the current state of the index), but most operations move data between the index file and either the database or the working directory. Thus there are four main -combinations:</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="working-directory-to-index"></a>working directory -> index</h3></div></div></div><p>The <a href="git-update-index.html" target="_top">git-update-index(1)</a> command updates the index with +combinations:</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="working-directory-to-index"></a>working directory -> index</h3></div></div></div><p>The <a class="ulink" href="git-update-index.html" target="_top">git-update-index(1)</a> command updates the index with information from the working directory. You generally update the index information by just specifying the filename you want to update, like so:</p><div class="literallayout"><p>$ git update-index filename</p></div><p>but to avoid common mistakes with filename globbing etc, the command @@ -1589,12 +1589,12 @@ structure, the index will be updated with their new status, not removed. The only thing <code class="literal">—remove</code> means is that update-index will be considering a removed file to be a valid thing, and if the file really -does not exist any more, it will update the index accordingly.</p><p>As a special case, you can also do <code class="literal">git-update-index —refresh</code>, which +does not exist any more, it will update the index accordingly.</p><p>As a special case, you can also do <code class="literal">git update-index —refresh</code>, which will refresh the "stat" information of each index to match the current stat information. It will <span class="emphasis"><em>not</em></span> update the object status itself, and it will only update the fields that are used to quickly test whether -an object still matches its old backing store object.</p><p>The previously introduced <a href="git-add.html" target="_top">git-add(1)</a> is just a wrapper for -<a href="git-update-index.html" target="_top">git-update-index(1)</a>.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="index-to-object-database"></a>index -> object database</h3></div></div></div><p>You write your current index file to a "tree" object with the program</p><div class="literallayout"><p>$ git write-tree</p></div><p>that doesn't come with any options—it will just write out the +an object still matches its old backing store object.</p><p>The previously introduced <a class="ulink" href="git-add.html" target="_top">git-add(1)</a> is just a wrapper for +<a class="ulink" href="git-update-index.html" target="_top">git-update-index(1)</a>.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="index-to-object-database"></a>index -> object database</h3></div></div></div><p>You write your current index file to a "tree" object with the program</p><div class="literallayout"><p>$ git write-tree</p></div><p>that doesn't come with any options—it will just write out the current index into the set of tree objects that describe that state, and it will return the name of the resulting top-level tree. You can use that tree to re-generate the index at any time by going in the @@ -1614,7 +1614,7 @@ if you have an old version of the tree already checked out, you will need to use the "-f" flag (<span class="emphasis"><em>before</em></span> the "-a" flag or the filename) to <span class="emphasis"><em>force</em></span> the checkout.</p><p>Finally, there are a few odds and ends which are not purely moving -from one representation to the other:</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="tying-it-all-together"></a>Tying it all together</h3></div></div></div><p>To commit a tree you have instantiated with "git-write-tree", you'd +from one representation to the other:</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="tying-it-all-together"></a>Tying it all together</h3></div></div></div><p>To commit a tree you have instantiated with "git write-tree", you'd create a "commit" object that refers to that tree and the history behind it—most notably the "parent" commits that preceded it in history.</p><p>Normally a "commit" has one parent: the previous state of the tree @@ -1665,7 +1665,7 @@ +-----------+<br> </p></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="examining-the-data"></a>Examining the data</h2></div></div></div><p>You can examine the data represented in the object database and the index with various helper tools. For every object, you can use -<a href="git-cat-file.html" target="_top">git-cat-file(1)</a> to examine details about the +<a class="ulink" href="git-cat-file.html" target="_top">git-cat-file(1)</a> to examine details about the object:</p><div class="literallayout"><p>$ git cat-file -t <objectname></p></div><p>shows the type of the object, and once you have the type (which is usually implicit in where you find the object), you can use</p><div class="literallayout"><p>$ git cat-file blob|tree|commit|tag <objectname></p></div><p>to show its contents. NOTE! Trees have binary content, and as a result there is a special helper for showing that content, called @@ -1692,7 +1692,7 @@ always do a merge against your last commit (which should thus match what you have in your current index anyway).</p><p>To do the merge, do</p><div class="literallayout"><p>$ git read-tree -m -u <origtree> <yourtree> <targettree></p></div><p>which will do all trivial merge operations for you directly in the index file, and you can just write the result out with -<code class="literal">git-write-tree</code>.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="merging-multiple-trees-2"></a>Merging multiple trees, continued</h2></div></div></div><p>Sadly, many merges aren't trivial. If there are files that have +<code class="literal">git write-tree</code>.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="merging-multiple-trees-2"></a>Merging multiple trees, continued</h2></div></div></div><p>Sadly, many merges aren't trivial. If there are files that have been added, moved or removed, or if both branches have modified the same file, you will be left with an index tree that contains "merge entries" in it. Such an index tree can <span class="emphasis"><em>NOT</em></span> be written out to a tree @@ -1753,10 +1753,10 @@ start.</p><p>A good place to start is with the contents of the initial commit, with:</p><div class="literallayout"><p>$ git checkout e83c5163</p></div><p>The initial revision lays the foundation for almost everything git has today, but is small enough to read in one sitting.</p><p>Note that terminology has changed since that revision. For example, the README in that revision uses the word "changeset" to describe what we -now call a <a href="#def_commit_object">commit</a>.</p><p>Also, we do not call it "cache" any more, but "index", however, the +now call a <a class="link" href="#def_commit_object">commit</a>.</p><p>Also, we do not call it "cache" any more, but "index", however, the file is still called <code class="literal">cache.h</code>. Remark: Not much reason to change it now, especially since there is no good single name for it anyway, because it is -basically _the_ header file which is included by _all_ of Git's C sources.</p><p>If you grasp the ideas in that initial commit, you should check out a +basically <span class="emphasis"><em>the</em></span> header file which is included by <span class="emphasis"><em>all</em></span> of Git's C sources.</p><p>If you grasp the ideas in that initial commit, you should check out a more recent version and skim <code class="literal">cache.h</code>, <code class="literal">object.h</code> and <code class="literal">commit.h</code>.</p><p>In the early days, Git (in the tradition of UNIX) was a bunch of programs which were extremely simple, and which you used in scripts, piping the output of one into another. This turned out to be good for initial @@ -1767,15 +1767,15 @@ structures in <code class="literal">cache.h</code>), and that there are just a couple of object types (blobs, trees, commits and tags) which inherit their common structure from <code class="literal">struct object</code>, which is their first member (and thus, you can cast e.g. -<code class="literal">(struct object *)commit</code> to achieve the _same_ as <code class="literal">&commit->object</code>, i.e. -get at the object name and flags).</p><p>Now is a good point to take a break to let this information sink in.</p><p>Next step: get familiar with the object naming. Read <a href="#naming-commits" title="Naming commits">the section called “Naming commits”</a>. +<code class="literal">(struct object *)commit</code> to achieve the <span class="emphasis"><em>same</em></span> as <code class="literal">&commit->object</code>, i.e. +get at the object name and flags).</p><p>Now is a good point to take a break to let this information sink in.</p><p>Next step: get familiar with the object naming. Read <a class="xref" href="#naming-commits" title="Naming commits">the section called “Naming commits”</a>. There are quite a few ways to name an object (and not only revisions!). All of these are handled in <code class="literal">sha1_name.c</code>. Just have a quick look at the function <code class="literal">get_sha1()</code>. A lot of the special handling is done by functions like <code class="literal">get_sha1_basic()</code> or the likes.</p><p>This is just to get you into the groove for the most libified part of Git: -the revision walker.</p><p>Basically, the initial version of <code class="literal">git log</code> was a shell script:</p><div class="literallayout"><p>$ git-rev-list --pretty $(git-rev-parse --default HEAD "$@") | \<br> +the revision walker.</p><p>Basically, the initial version of <code class="literal">git-log</code> was a shell script:</p><div class="literallayout"><p>$ git-rev-list --pretty $(git-rev-parse --default HEAD "$@") | \<br> LESS=-S ${PAGER:-less}</p></div><p>What does this mean?</p><p><code class="literal">git-rev-list</code> is the original version of the revision walker, which -_always_ printed a list of revisions to stdout. It is still functional, +<span class="emphasis"><em>always</em></span> printed a list of revisions to stdout. It is still functional, and needs to, since most new Git programs start out as scripts using <code class="literal">git-rev-list</code>.</p><p><code class="literal">git-rev-parse</code> is not as important any more; it was only used to filter out options that were relevant for the different plumbing commands that were @@ -1790,7 +1790,7 @@ commits one by one with the function <code class="literal">get_revision()</code>.</p><p>If you are interested in more details of the revision walking process, just have a look at the first implementation of <code class="literal">cmd_log()</code>; call <code class="literal">git show v1.3.0~155^2~4</code> and scroll down to that function (note that you -no longer need to call <code class="literal">setup_pager()</code> directly).</p><p>Nowadays, <code class="literal">git log</code> is a builtin, which means that it is _contained_ in the +no longer need to call <code class="literal">setup_pager()</code> directly).</p><p>Nowadays, <code class="literal">git-log</code> is a builtin, which means that it is <span class="emphasis"><em>contained</em></span> in the command <code class="literal">git</code>. The source side of a builtin is</p><div class="itemizedlist"><ul type="disc"><li> a function called <code class="literal">cmd_<bla></code>, typically defined in <code class="literal">builtin-<bla>.c</code>, and declared in <code class="literal">builtin.h</code>, @@ -1801,13 +1801,13 @@ </li></ul></div><p>Sometimes, more than one builtin is contained in one source file. For example, <code class="literal">cmd_whatchanged()</code> and <code class="literal">cmd_log()</code> both reside in <code class="literal">builtin-log.c</code>, since they share quite a bit of code. In that case, the commands which are -_not_ named like the <code class="literal">.c</code> file in which they live have to be listed in -<code class="literal">BUILT_INS</code> in the <code class="literal">Makefile</code>.</p><p><code class="literal">git log</code> looks more complicated in C than it does in the original script, +<span class="emphasis"><em>not</em></span> named like the <code class="literal">.c</code> file in which they live have to be listed in +<code class="literal">BUILT_INS</code> in the <code class="literal">Makefile</code>.</p><p><code class="literal">git-log</code> looks more complicated in C than it does in the original script, but that allows for a much greater flexibility and performance.</p><p>Here again it is a good point to take a pause.</p><p>Lesson three is: study the code. Really, it is the best way to learn about the organization of Git (after you know the basic concepts).</p><p>So, think about something which you are interested in, say, "how can I access a blob just knowing the object name of it?". The first step is to find a Git command with which you can do it. In this example, it is either -<code class="literal">git show</code> or <code class="literal">git cat-file</code>.</p><p>For the sake of clarity, let's stay with <code class="literal">git cat-file</code>, because it</p><div class="itemizedlist"><ul type="disc"><li> +<code class="literal">git-show</code> or <code class="literal">git-cat-file</code>.</p><p>For the sake of clarity, let's stay with <code class="literal">git-cat-file</code>, because it</p><div class="itemizedlist"><ul type="disc"><li> is plumbing, and </li><li> was around even in the initial commit (it literally went only through @@ -1822,7 +1822,7 @@ here is the call to <code class="literal">get_sha1()</code>. It tries to interpret <code class="literal">argv[2]</code> as an object name, and if it refers to an object which is present in the current repository, it writes the resulting SHA-1 into the variable <code class="literal">sha1</code>.</p><p>Two things are interesting here:</p><div class="itemizedlist"><ul type="disc"><li> -<code class="literal">get_sha1()</code> returns 0 on _success_. This might surprise some new +<code class="literal">get_sha1()</code> returns 0 on <span class="emphasis"><em>success</em></span>. This might surprise some new Git hackers, but there is a long tradition in UNIX to return different negative numbers in case of different errors—and 0 on success. </li><li> @@ -1840,7 +1840,7 @@ the source.</p><p>To find out how the result can be used, just read on in <code class="literal">cmd_cat_file()</code>:</p><div class="literallayout"><p> write_or_die(1, buf, size);</p></div><p>Sometimes, you do not know where to look for a feature. In many such cases, it helps to search through the output of <code class="literal">git log</code>, and then <code class="literal">git-show</code> the corresponding commit.</p><p>Example: If you know that there was some test case for <code class="literal">git-bundle</code>, but -do not remember where it was (yes, you _could_ <code class="literal">git grep bundle t/</code>, but that +do not remember where it was (yes, you <span class="emphasis"><em>could</em></span> <code class="literal">git grep bundle t/</code>, but that does not illustrate the point!):</p><div class="literallayout"><p>$ git log --no-merges t/</p></div><p>In the pager (<code class="literal">less</code>), just search for "bundle", go a few lines back, and see that it is in commit 18449ab0… Now just copy this object name, and paste it into the command line</p><div class="literallayout"><p>$ git show 18449ab0</p></div><p>Voila.</p><p>Another example: Find out what to do in order to make some script a @@ -1848,14 +1848,14 @@ itself!</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="glossary"></a>Chapter 11. GIT Glossary</h2></div></div></div><div class="variablelist"><dl><dt><span class="term"> <a name="def_alternate_object_database"></a>alternate object database </span></dt><dd> - Via the alternates mechanism, a <a href="#def_repository">repository</a> - can inherit part of its <a href="#def_object_database">object database</a> + Via the alternates mechanism, a <a class="link" href="#def_repository">repository</a> + can inherit part of its <a class="link" href="#def_object_database">object database</a> from another object database, which is called "alternate". </dd><dt><span class="term"> <a name="def_bare_repository"></a>bare repository </span></dt><dd> A bare repository is normally an appropriately - named <a href="#def_directory">directory</a> with a <code class="literal">.git</code> suffix that does not + named <a class="link" href="#def_directory">directory</a> with a <code class="literal">.git</code> suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the <code class="literal">git</code> administrative and control files that would normally be present in the @@ -1866,59 +1866,59 @@ </dd><dt><span class="term"> <a name="def_blob_object"></a>blob object </span></dt><dd> - Untyped <a href="#def_object">object</a>, e.g. the contents of a file. + Untyped <a class="link" href="#def_object">object</a>, e.g. the contents of a file. </dd><dt><span class="term"> <a name="def_branch"></a>branch </span></dt><dd> A "branch" is an active line of development. The most recent - <a href="#def_commit">commit</a> on a branch is referred to as the tip of + <a class="link" href="#def_commit">commit</a> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch - <a href="#def_head">head</a>, which moves forward as additional development + <a class="link" href="#def_head">head</a>, which moves forward as additional development is done on the branch. A single git - <a href="#def_repository">repository</a> can track an arbitrary number of - branches, but your <a href="#def_working_tree">working tree</a> is + <a class="link" href="#def_repository">repository</a> can track an arbitrary number of + branches, but your <a class="link" href="#def_working_tree">working tree</a> is associated with just one of them (the "current" or "checked out" - branch), and <a href="#def_HEAD">HEAD</a> points to that branch. + branch), and <a class="link" href="#def_HEAD">HEAD</a> points to that branch. </dd><dt><span class="term"> <a name="def_cache"></a>cache </span></dt><dd> - Obsolete for: <a href="#def_index">index</a>. + Obsolete for: <a class="link" href="#def_index">index</a>. </dd><dt><span class="term"> <a name="def_chain"></a>chain </span></dt><dd> - A list of objects, where each <a href="#def_object">object</a> in the list contains + A list of objects, where each <a class="link" href="#def_object">object</a> in the list contains a reference to its successor (for example, the successor of a - <a href="#def_commit">commit</a> could be one of its <a href="#def_parent">parents</a>). + <a class="link" href="#def_commit">commit</a> could be one of its <a class="link" href="#def_parent">parents</a>). </dd><dt><span class="term"> <a name="def_changeset"></a>changeset </span></dt><dd> - BitKeeper/cvsps speak for "<a href="#def_commit">commit</a>". Since git does not + BitKeeper/cvsps speak for "<a class="link" href="#def_commit">commit</a>". Since git does not store changes, but states, it really does not make sense to use the term "changesets" with git. </dd><dt><span class="term"> <a name="def_checkout"></a>checkout </span></dt><dd> The action of updating all or part of the - <a href="#def_working_tree">working tree</a> with a <a href="#def_tree_object">tree object</a> - or <a href="#def_blob_object">blob</a> from the - <a href="#def_object_database">object database</a>, and updating the - <a href="#def_index">index</a> and <a href="#def_HEAD">HEAD</a> if the whole working tree has - been pointed at a new <a href="#def_branch">branch</a>. + <a class="link" href="#def_working_tree">working tree</a> with a <a class="link" href="#def_tree_object">tree object</a> + or <a class="link" href="#def_blob_object">blob</a> from the + <a class="link" href="#def_object_database">object database</a>, and updating the + <a class="link" href="#def_index">index</a> and <a class="link" href="#def_HEAD">HEAD</a> if the whole working tree has + been pointed at a new <a class="link" href="#def_branch">branch</a>. </dd><dt><span class="term"> <a name="def_cherry-picking"></a>cherry-picking </span></dt><dd> - In <a href="#def_SCM">SCM</a> jargon, "cherry pick" means to choose a subset of + In <a class="link" href="#def_SCM">SCM</a> jargon, "cherry pick" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In GIT, this is performed by the "git cherry-pick" command to extract the change introduced - by an existing <a href="#def_commit">commit</a> and to record it based on the tip - of the current <a href="#def_branch">branch</a> as a new commit. + by an existing <a class="link" href="#def_commit">commit</a> and to record it based on the tip + of the current <a class="link" href="#def_branch">branch</a> as a new commit. </dd><dt><span class="term"> <a name="def_clean"></a>clean </span></dt><dd> - A <a href="#def_working_tree">working tree</a> is clean, if it - corresponds to the <a href="#def_revision">revision</a> referenced by the current - <a href="#def_head">head</a>. Also see "<a href="#def_dirty">dirty</a>". + A <a class="link" href="#def_working_tree">working tree</a> is clean, if it + corresponds to the <a class="link" href="#def_revision">revision</a> referenced by the current + <a class="link" href="#def_head">head</a>. Also see "<a class="link" href="#def_dirty">dirty</a>". </dd><dt><span class="term"> <a name="def_commit"></a>commit </span></dt><dd><p> @@ -1927,17 +1927,17 @@ set of interrelated commits. The word "commit" is often used by git in the same places other revision control systems use the words "revision" or "version". Also used as a short - hand for <a href="#def_commit_object">commit object</a>. + hand for <a class="link" href="#def_commit_object">commit object</a>. </p><p>As a verb: The action of storing a new snapshot of the project's state in the git history, by creating a new commit representing the current -state of the <a href="#def_index">index</a> and advancing <a href="#def_HEAD">HEAD</a> +state of the <a class="link" href="#def_index">index</a> and advancing <a class="link" href="#def_HEAD">HEAD</a> to point at the new commit.</p></dd><dt><span class="term"> <a name="def_commit_object"></a>commit object </span></dt><dd> - An <a href="#def_object">object</a> which contains the information about a - particular <a href="#def_revision">revision</a>, such as <a href="#def_parent">parents</a>, committer, - author, date and the <a href="#def_tree_object">tree object</a> which corresponds - to the top <a href="#def_directory">directory</a> of the stored + An <a class="link" href="#def_object">object</a> which contains the information about a + particular <a class="link" href="#def_revision">revision</a>, such as <a class="link" href="#def_parent">parents</a>, committer, + author, date and the <a class="link" href="#def_tree_object">tree object</a> which corresponds + to the top <a class="link" href="#def_directory">directory</a> of the stored revision. </dd><dt><span class="term"> <a name="def_core_git"></a>core git @@ -1947,28 +1947,28 @@ </dd><dt><span class="term"> <a name="def_DAG"></a>DAG </span></dt><dd> - Directed acyclic graph. The <a href="#def_commit_object">commit objects</a> form a + Directed acyclic graph. The <a class="link" href="#def_commit_object">commit objects</a> form a directed acyclic graph, because they have parents (directed), and the - graph of commit objects is acyclic (there is no <a href="#def_chain">chain</a> - which begins and ends with the same <a href="#def_object">object</a>). + graph of commit objects is acyclic (there is no <a class="link" href="#def_chain">chain</a> + which begins and ends with the same <a class="link" href="#def_object">object</a>). </dd><dt><span class="term"> <a name="def_dangling_object"></a>dangling object </span></dt><dd> - An <a href="#def_unreachable_object">unreachable object</a> which is not - <a href="#def_reachable">reachable</a> even from other unreachable objects; a + An <a class="link" href="#def_unreachable_object">unreachable object</a> which is not + <a class="link" href="#def_reachable">reachable</a> even from other unreachable objects; a dangling object has no references to it from any - reference or <a href="#def_object">object</a> in the <a href="#def_repository">repository</a>. + reference or <a class="link" href="#def_object">object</a> in the <a class="link" href="#def_repository">repository</a>. </dd><dt><span class="term"> <a name="def_detached_HEAD"></a>detached HEAD </span></dt><dd> - Normally the <a href="#def_HEAD">HEAD</a> stores the name of a - <a href="#def_branch">branch</a>. However, git also allows you to <a href="#def_checkout">check out</a> - an arbitrary <a href="#def_commit">commit</a> that isn't necessarily the tip of any + Normally the <a class="link" href="#def_HEAD">HEAD</a> stores the name of a + <a class="link" href="#def_branch">branch</a>. However, git also allows you to <a class="link" href="#def_checkout">check out</a> + an arbitrary <a class="link" href="#def_commit">commit</a> that isn't necessarily the tip of any particular branch. In this case HEAD is said to be "detached". </dd><dt><span class="term"> <a name="def_dircache"></a>dircache </span></dt><dd> - You are <span class="strong"><strong>waaaaay</strong></span> behind. See <a href="#def_index">index</a>. + You are <span class="strong"><strong>waaaaay</strong></span> behind. See <a class="link" href="#def_index">index</a>. </dd><dt><span class="term"> <a name="def_directory"></a>directory </span></dt><dd> @@ -1976,39 +1976,39 @@ </dd><dt><span class="term"> <a name="def_dirty"></a>dirty </span></dt><dd> - A <a href="#def_working_tree">working tree</a> is said to be "dirty" if - it contains modifications which have not been <a href="#def_commit">committed</a> to the current - <a href="#def_branch">branch</a>. + A <a class="link" href="#def_working_tree">working tree</a> is said to be "dirty" if + it contains modifications which have not been <a class="link" href="#def_commit">committed</a> to the current + <a class="link" href="#def_branch">branch</a>. </dd><dt><span class="term"> <a name="def_ent"></a>ent </span></dt><dd> - Favorite synonym to "<a href="#def_tree-ish">tree-ish</a>" by some total geeks. See + Favorite synonym to "<a class="link" href="#def_tree-ish">tree-ish</a>" by some total geeks. See <code class="literal">http://en.wikipedia.org/wiki/Ent_(Middle-earth)</code> for an in-depth explanation. Avoid this term, not to confuse people. </dd><dt><span class="term"> <a name="def_evil_merge"></a>evil merge </span></dt><dd> - An evil merge is a <a href="#def_merge">merge</a> that introduces changes that - do not appear in any <a href="#def_parent">parent</a>. + An evil merge is a <a class="link" href="#def_merge">merge</a> that introduces changes that + do not appear in any <a class="link" href="#def_parent">parent</a>. </dd><dt><span class="term"> <a name="def_fast_forward"></a>fast forward </span></dt><dd> - A fast-forward is a special type of <a href="#def_merge">merge</a> where you have a - <a href="#def_revision">revision</a> and you are "merging" another - <a href="#def_branch">branch</a>'s changes that happen to be a descendant of what - you have. In such these cases, you do not make a new <a href="#def_merge">merge</a> - <a href="#def_commit">commit</a> but instead just update to his + A fast-forward is a special type of <a class="link" href="#def_merge">merge</a> where you have a + <a class="link" href="#def_revision">revision</a> and you are "merging" another + <a class="link" href="#def_branch">branch</a>'s changes that happen to be a descendant of what + you have. In such these cases, you do not make a new <a class="link" href="#def_merge">merge</a> + <a class="link" href="#def_commit">commit</a> but instead just update to his revision. This will happen frequently on a - <a href="#def_tracking_branch">tracking branch</a> of a remote - <a href="#def_repository">repository</a>. + <a class="link" href="#def_tracking_branch">tracking branch</a> of a remote + <a class="link" href="#def_repository">repository</a>. </dd><dt><span class="term"> <a name="def_fetch"></a>fetch </span></dt><dd> - Fetching a <a href="#def_branch">branch</a> means to get the - branch's <a href="#def_head_ref">head ref</a> from a remote - <a href="#def_repository">repository</a>, to find out which objects are - missing from the local <a href="#def_object_database">object database</a>, - and to get them, too. See also <a href="git-fetch.html" target="_top">git-fetch(1)</a>. + Fetching a <a class="link" href="#def_branch">branch</a> means to get the + branch's <a class="link" href="#def_head_ref">head ref</a> from a remote + <a class="link" href="#def_repository">repository</a>, to find out which objects are + missing from the local <a class="link" href="#def_object_database">object database</a>, + and to get them, too. See also <a class="ulink" href="git-fetch.html" target="_top">git-fetch(1)</a>. </dd><dt><span class="term"> <a name="def_file_system"></a>file system </span></dt><dd> @@ -2018,38 +2018,38 @@ </dd><dt><span class="term"> <a name="def_git_archive"></a>git archive </span></dt><dd> - Synonym for <a href="#def_repository">repository</a> (for arch people). + Synonym for <a class="link" href="#def_repository">repository</a> (for arch people). </dd><dt><span class="term"> <a name="def_grafts"></a>grafts </span></dt><dd> Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way - you can make git pretend the set of <a href="#def_parent">parents</a> a <a href="#def_commit">commit</a> has + you can make git pretend the set of <a class="link" href="#def_parent">parents</a> a <a class="link" href="#def_commit">commit</a> has is different from what was recorded when the commit was created. Configured via the <code class="literal">.git/info/grafts</code> file. </dd><dt><span class="term"> <a name="def_hash"></a>hash </span></dt><dd> - In git's context, synonym to <a href="#def_object_name">object name</a>. + In git's context, synonym to <a class="link" href="#def_object_name">object name</a>. </dd><dt><span class="term"> <a name="def_head"></a>head </span></dt><dd> - A <a href="#def_ref">named reference</a> to the <a href="#def_commit">commit</a> at the tip of a - <a href="#def_branch">branch</a>. Heads are stored in + A <a class="link" href="#def_ref">named reference</a> to the <a class="link" href="#def_commit">commit</a> at the tip of a + <a class="link" href="#def_branch">branch</a>. Heads are stored in <code class="literal">$GIT_DIR/refs/heads/</code>, except when using packed refs. (See - <a href="git-pack-refs.html" target="_top">git-pack-refs(1)</a>.) + <a class="ulink" href="git-pack-refs.html" target="_top">git-pack-refs(1)</a>.) </dd><dt><span class="term"> <a name="def_HEAD"></a>HEAD </span></dt><dd> - The current <a href="#def_branch">branch</a>. In more detail: Your <a href="#def_working_tree">working tree</a> is normally derived from the state of the tree + The current <a class="link" href="#def_branch">branch</a>. In more detail: Your <a class="link" href="#def_working_tree">working tree</a> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the - <a href="#def_head">heads</a> in your repository, except when using a - <a href="#def_detached_HEAD">detached HEAD</a>, in which case it may + <a class="link" href="#def_head">heads</a> in your repository, except when using a + <a class="link" href="#def_detached_HEAD">detached HEAD</a>, in which case it may reference an arbitrary commit. </dd><dt><span class="term"> <a name="def_head_ref"></a>head ref </span></dt><dd> - A synonym for <a href="#def_head">head</a>. + A synonym for <a class="link" href="#def_head">head</a>. </dd><dt><span class="term"> <a name="def_hook"></a>hook </span></dt><dd> @@ -2065,21 +2065,21 @@ </span></dt><dd> A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your - <a href="#def_working_tree">working tree</a>. Truth be told, it can also contain a second, and even + <a class="link" href="#def_working_tree">working tree</a>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used - when <a href="#def_merge">merging</a>. + when <a class="link" href="#def_merge">merging</a>. </dd><dt><span class="term"> <a name="def_index_entry"></a>index entry </span></dt><dd> The information regarding a particular file, stored in the - <a href="#def_index">index</a>. An index entry can be unmerged, if a - <a href="#def_merge">merge</a> was started, but not yet finished (i.e. if + <a class="link" href="#def_index">index</a>. An index entry can be unmerged, if a + <a class="link" href="#def_merge">merge</a> was started, but not yet finished (i.e. if the index contains multiple versions of that file). </dd><dt><span class="term"> <a name="def_master"></a>master </span></dt><dd> - The default development <a href="#def_branch">branch</a>. Whenever you - create a git <a href="#def_repository">repository</a>, a branch named + The default development <a class="link" href="#def_branch">branch</a>. Whenever you + create a git <a class="link" href="#def_repository">repository</a>, a branch named "master" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required. @@ -2087,64 +2087,64 @@ <a name="def_merge"></a>merge </span></dt><dd><p> As a verb: To bring the contents of another - <a href="#def_branch">branch</a> (possibly from an external - <a href="#def_repository">repository</a>) into the current branch. In the + <a class="link" href="#def_branch">branch</a> (possibly from an external + <a class="link" href="#def_repository">repository</a>) into the current branch. In the case where the merged-in branch is from a different repository, - this is done by first <a href="#def_fetch">fetching</a> the remote branch + this is done by first <a class="link" href="#def_fetch">fetching</a> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a - <a href="#def_pull">pull</a>. Merging is performed by an automatic process + <a class="link" href="#def_pull">pull</a>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge. -</p><p>As a noun: unless it is a <a href="#def_fast_forward">fast forward</a>, a -successful merge results in the creation of a new <a href="#def_commit">commit</a> +</p><p>As a noun: unless it is a <a class="link" href="#def_fast_forward">fast forward</a>, a +successful merge results in the creation of a new <a class="link" href="#def_commit">commit</a> representing the result of the merge, and having as -<a href="#def_parent">parents</a> the tips of the merged <a href="#def_branch">branches</a>. +<a class="link" href="#def_parent">parents</a> the tips of the merged <a class="link" href="#def_branch">branches</a>. This commit is referred to as a "merge commit", or sometimes just a "merge".</p></dd><dt><span class="term"> <a name="def_object"></a>object </span></dt><dd> The unit of storage in git. It is uniquely identified by the - <a href="#def_SHA1">SHA1</a> of its contents. Consequently, an + <a class="link" href="#def_SHA1">SHA1</a> of its contents. Consequently, an object can not be changed. </dd><dt><span class="term"> <a name="def_object_database"></a>object database </span></dt><dd> - Stores a set of "objects", and an individual <a href="#def_object">object</a> is - identified by its <a href="#def_object_name">object name</a>. The objects usually + Stores a set of "objects", and an individual <a class="link" href="#def_object">object</a> is + identified by its <a class="link" href="#def_object_name">object name</a>. The objects usually live in <code class="literal">$GIT_DIR/objects/</code>. </dd><dt><span class="term"> <a name="def_object_identifier"></a>object identifier </span></dt><dd> - Synonym for <a href="#def_object_name">object name</a>. + Synonym for <a class="link" href="#def_object_name">object name</a>. </dd><dt><span class="term"> <a name="def_object_name"></a>object name </span></dt><dd> - The unique identifier of an <a href="#def_object">object</a>. The <a href="#def_hash">hash</a> + The unique identifier of an <a class="link" href="#def_object">object</a>. The <a class="link" href="#def_hash">hash</a> of the object's contents using the Secure Hash Algorithm 1 and usually represented by the 40 character hexadecimal encoding of - the <a href="#def_hash">hash</a> of the object. + the <a class="link" href="#def_hash">hash</a> of the object. </dd><dt><span class="term"> <a name="def_object_type"></a>object type </span></dt><dd> - One of the identifiers "<a href="#def_commit_object">commit</a>", - "<a href="#def_tree_object">tree</a>", "<a href="#def_tag_object">tag</a>" or - "<a href="#def_blob_object">blob</a>" describing the type of an - <a href="#def_object">object</a>. + One of the identifiers "<a class="link" href="#def_commit_object">commit</a>", + "<a class="link" href="#def_tree_object">tree</a>", "<a class="link" href="#def_tag_object">tag</a>" or + "<a class="link" href="#def_blob_object">blob</a>" describing the type of an + <a class="link" href="#def_object">object</a>. </dd><dt><span class="term"> <a name="def_octopus"></a>octopus </span></dt><dd> - To <a href="#def_merge">merge</a> more than two <a href="#def_branch">branches</a>. Also denotes an + To <a class="link" href="#def_merge">merge</a> more than two <a class="link" href="#def_branch">branches</a>. Also denotes an intelligent predator. </dd><dt><span class="term"> <a name="def_origin"></a>origin </span></dt><dd> - The default upstream <a href="#def_repository">repository</a>. Most projects have + The default upstream <a class="link" href="#def_repository">repository</a>. Most projects have at least one upstream project which they track. By default <span class="emphasis"><em>origin</em></span> is used for that purpose. New upstream updates - will be fetched into remote <a href="#def_tracking_branch">tracking branches</a> named + will be fetched into remote <a class="link" href="#def_tracking_branch">tracking branches</a> named origin/name-of-upstream-branch, which you can see using "<code class="literal">git branch -r</code>". </dd><dt><span class="term"> @@ -2156,120 +2156,120 @@ <a name="def_pack_index"></a>pack index </span></dt><dd> The list of identifiers, and other information, of the objects in a - <a href="#def_pack">pack</a>, to assist in efficiently accessing the contents of a + <a class="link" href="#def_pack">pack</a>, to assist in efficiently accessing the contents of a pack. </dd><dt><span class="term"> <a name="def_parent"></a>parent </span></dt><dd> - A <a href="#def_commit_object">commit object</a> contains a (possibly empty) list + A <a class="link" href="#def_commit_object">commit object</a> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents. </dd><dt><span class="term"> <a name="def_pickaxe"></a>pickaxe </span></dt><dd> - The term <a href="#def_pickaxe">pickaxe</a> refers to an option to the diffcore + The term <a class="link" href="#def_pickaxe">pickaxe</a> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the <code class="literal">—pickaxe-all</code> option, it can be used to view the full - <a href="#def_changeset">changeset</a> that introduced or removed, say, a - particular line of text. See <a href="git-diff.html" target="_top">git-diff(1)</a>. + <a class="link" href="#def_changeset">changeset</a> that introduced or removed, say, a + particular line of text. See <a class="ulink" href="git-diff.html" target="_top">git-diff(1)</a>. </dd><dt><span class="term"> <a name="def_plumbing"></a>plumbing </span></dt><dd> - Cute name for <a href="#def_core_git">core git</a>. + Cute name for <a class="link" href="#def_core_git">core git</a>. </dd><dt><span class="term"> <a name="def_porcelain"></a>porcelain </span></dt><dd> Cute name for programs and program suites depending on - <a href="#def_core_git">core git</a>, presenting a high level access to - core git. Porcelains expose more of a <a href="#def_SCM">SCM</a> - interface than the <a href="#def_plumbing">plumbing</a>. + <a class="link" href="#def_core_git">core git</a>, presenting a high level access to + core git. Porcelains expose more of a <a class="link" href="#def_SCM">SCM</a> + interface than the <a class="link" href="#def_plumbing">plumbing</a>. </dd><dt><span class="term"> <a name="def_pull"></a>pull </span></dt><dd> - Pulling a <a href="#def_branch">branch</a> means to <a href="#def_fetch">fetch</a> it and - <a href="#def_merge">merge</a> it. See also <a href="git-pull.html" target="_top">git-pull(1)</a>. + Pulling a <a class="link" href="#def_branch">branch</a> means to <a class="link" href="#def_fetch">fetch</a> it and + <a class="link" href="#def_merge">merge</a> it. See also <a class="ulink" href="git-pull.html" target="_top">git-pull(1)</a>. </dd><dt><span class="term"> <a name="def_push"></a>push </span></dt><dd> - Pushing a <a href="#def_branch">branch</a> means to get the branch's - <a href="#def_head_ref">head ref</a> from a remote <a href="#def_repository">repository</a>, + Pushing a <a class="link" href="#def_branch">branch</a> means to get the branch's + <a class="link" href="#def_head_ref">head ref</a> from a remote <a class="link" href="#def_repository">repository</a>, find out if it is a direct ancestor to the branch's local head ref, and in that case, putting all - objects, which are <a href="#def_reachable">reachable</a> from the local + objects, which are <a class="link" href="#def_reachable">reachable</a> from the local head ref, and which are missing from the remote repository, into the remote - <a href="#def_object_database">object database</a>, and updating the remote - head ref. If the remote <a href="#def_head">head</a> is not an + <a class="link" href="#def_object_database">object database</a>, and updating the remote + head ref. If the remote <a class="link" href="#def_head">head</a> is not an ancestor to the local head, the push fails. </dd><dt><span class="term"> <a name="def_reachable"></a>reachable </span></dt><dd> - All of the ancestors of a given <a href="#def_commit">commit</a> are said to be + All of the ancestors of a given <a class="link" href="#def_commit">commit</a> are said to be "reachable" from that commit. More - generally, one <a href="#def_object">object</a> is reachable from - another if we can reach the one from the other by a <a href="#def_chain">chain</a> - that follows <a href="#def_tag">tags</a> to whatever they tag, - <a href="#def_commit_object">commits</a> to their parents or trees, and - <a href="#def_tree_object">trees</a> to the trees or <a href="#def_blob_object">blobs</a> + generally, one <a class="link" href="#def_object">object</a> is reachable from + another if we can reach the one from the other by a <a class="link" href="#def_chain">chain</a> + that follows <a class="link" href="#def_tag">tags</a> to whatever they tag, + <a class="link" href="#def_commit_object">commits</a> to their parents or trees, and + <a class="link" href="#def_tree_object">trees</a> to the trees or <a class="link" href="#def_blob_object">blobs</a> that they contain. </dd><dt><span class="term"> <a name="def_rebase"></a>rebase </span></dt><dd> - To reapply a series of changes from a <a href="#def_branch">branch</a> to a - different base, and reset the <a href="#def_head">head</a> of that branch + To reapply a series of changes from a <a class="link" href="#def_branch">branch</a> to a + different base, and reset the <a class="link" href="#def_head">head</a> of that branch to the result. </dd><dt><span class="term"> <a name="def_ref"></a>ref </span></dt><dd> - A 40-byte hex representation of a <a href="#def_SHA1">SHA1</a> or a name that - denotes a particular <a href="#def_object">object</a>. These may be stored in + A 40-byte hex representation of a <a class="link" href="#def_SHA1">SHA1</a> or a name that + denotes a particular <a class="link" href="#def_object">object</a>. These may be stored in <code class="literal">$GIT_DIR/refs/</code>. </dd><dt><span class="term"> <a name="def_reflog"></a>reflog </span></dt><dd> A reflog shows the local "history" of a ref. In other words, - it can tell you what the 3rd last revision in _this_ repository - was, and what was the current state in _this_ repository, - yesterday 9:14pm. See <a href="git-reflog.html" target="_top">git-reflog(1)</a> for details. + it can tell you what the 3rd last revision in <span class="emphasis"><em>this</em></span> repository + was, and what was the current state in <span class="emphasis"><em>this</em></span> repository, + yesterday 9:14pm. See <a class="ulink" href="git-reflog.html" target="_top">git-reflog(1)</a> for details. </dd><dt><span class="term"> <a name="def_refspec"></a>refspec </span></dt><dd> - A "refspec" is used by <a href="#def_fetch">fetch</a> and - <a href="#def_push">push</a> to describe the mapping between remote - <a href="#def_ref">ref</a> and local ref. They are combined with a colon in + A "refspec" is used by <a class="link" href="#def_fetch">fetch</a> and + <a class="link" href="#def_push">push</a> to describe the mapping between remote + <a class="link" href="#def_ref">ref</a> and local ref. They are combined with a colon in the format <src>:<dst>, preceded by an optional plus sign, +. For example: <code class="literal">git fetch $URL refs/heads/master:refs/heads/origin</code> means "grab the master - <a href="#def_branch">branch</a> <a href="#def_head">head</a> from the $URL and store + <a class="link" href="#def_branch">branch</a> <a class="link" href="#def_head">head</a> from the $URL and store it as my origin branch head". And <code class="literal">git push $URL refs/heads/master:refs/heads/to-upstream</code> means "publish my master branch head as to-upstream branch at $URL". See also - <a href="git-push.html" target="_top">git-push(1)</a>. + <a class="ulink" href="git-push.html" target="_top">git-push(1)</a>. </dd><dt><span class="term"> <a name="def_repository"></a>repository </span></dt><dd> - A collection of <a href="#def_ref">refs</a> together with an - <a href="#def_object_database">object database</a> containing all objects - which are <a href="#def_reachable">reachable</a> from the refs, possibly - accompanied by meta data from one or more <a href="#def_porcelain">porcelains</a>. A + A collection of <a class="link" href="#def_ref">refs</a> together with an + <a class="link" href="#def_object_database">object database</a> containing all objects + which are <a class="link" href="#def_reachable">reachable</a> from the refs, possibly + accompanied by meta data from one or more <a class="link" href="#def_porcelain">porcelains</a>. A repository can share an object database with other repositories - via <a href="#def_alternate_object_database">alternates mechanism</a>. + via <a class="link" href="#def_alternate_object_database">alternates mechanism</a>. </dd><dt><span class="term"> <a name="def_resolve"></a>resolve </span></dt><dd> The action of fixing up manually what a failed automatic - <a href="#def_merge">merge</a> left behind. + <a class="link" href="#def_merge">merge</a> left behind. </dd><dt><span class="term"> <a name="def_revision"></a>revision </span></dt><dd> A particular state of files and directories which was stored in the - <a href="#def_object_database">object database</a>. It is referenced by a - <a href="#def_commit_object">commit object</a>. + <a class="link" href="#def_object_database">object database</a>. It is referenced by a + <a class="link" href="#def_commit_object">commit object</a>. </dd><dt><span class="term"> <a name="def_rewind"></a>rewind </span></dt><dd> To throw away part of the development, i.e. to assign the - <a href="#def_head">head</a> to an earlier <a href="#def_revision">revision</a>. + <a class="link" href="#def_head">head</a> to an earlier <a class="link" href="#def_revision">revision</a>. </dd><dt><span class="term"> <a name="def_SCM"></a>SCM </span></dt><dd> @@ -2277,49 +2277,49 @@ </dd><dt><span class="term"> <a name="def_SHA1"></a>SHA1 </span></dt><dd> - Synonym for <a href="#def_object_name">object name</a>. + Synonym for <a class="link" href="#def_object_name">object name</a>. </dd><dt><span class="term"> <a name="def_shallow_repository"></a>shallow repository </span></dt><dd> - A shallow <a href="#def_repository">repository</a> has an incomplete - history some of whose <a href="#def_commit">commits</a> have <a href="#def_parent">parents</a> cauterized away (in other + A shallow <a class="link" href="#def_repository">repository</a> has an incomplete + history some of whose <a class="link" href="#def_commit">commits</a> have <a class="link" href="#def_parent">parents</a> cauterized away (in other words, git is told to pretend that these commits do not have the - parents, even though they are recorded in the <a href="#def_commit_object">commit object</a>). This is sometimes useful when you are interested only in the + parents, even though they are recorded in the <a class="link" href="#def_commit_object">commit object</a>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository - is created by giving the <code class="literal">—depth</code> option to <a href="git-clone.html" target="_top">git-clone(1)</a>, and - its history can be later deepened with <a href="git-fetch.html" target="_top">git-fetch(1)</a>. + is created by giving the <code class="literal">—depth</code> option to <a class="ulink" href="git-clone.html" target="_top">git-clone(1)</a>, and + its history can be later deepened with <a class="ulink" href="git-fetch.html" target="_top">git-fetch(1)</a>. </dd><dt><span class="term"> <a name="def_symref"></a>symref </span></dt><dd> - Symbolic reference: instead of containing the <a href="#def_SHA1">SHA1</a> + Symbolic reference: instead of containing the <a class="link" href="#def_SHA1">SHA1</a> id itself, it is of the format <span class="emphasis"><em>ref: refs/some/thing</em></span> and when referenced, it recursively dereferences to this reference. - <span class="emphasis"><em><a href="#def_HEAD">HEAD</a></em></span> is a prime example of a symref. Symbolic - references are manipulated with the <a href="git-symbolic-ref.html" target="_top">git-symbolic-ref(1)</a> + <span class="emphasis"><em><a class="link" href="#def_HEAD">HEAD</a></em></span> is a prime example of a symref. Symbolic + references are manipulated with the <a class="ulink" href="git-symbolic-ref.html" target="_top">git-symbolic-ref(1)</a> command. </dd><dt><span class="term"> <a name="def_tag"></a>tag </span></dt><dd> - A <a href="#def_ref">ref</a> pointing to a <a href="#def_tag_object">tag</a> or - <a href="#def_commit_object">commit object</a>. In contrast to a <a href="#def_head">head</a>, - a tag is not changed by a <a href="#def_commit">commit</a>. Tags (not - <a href="#def_tag_object">tag objects</a>) are stored in <code class="literal">$GIT_DIR/refs/tags/</code>. A + A <a class="link" href="#def_ref">ref</a> pointing to a <a class="link" href="#def_tag_object">tag</a> or + <a class="link" href="#def_commit_object">commit object</a>. In contrast to a <a class="link" href="#def_head">head</a>, + a tag is not changed by a <a class="link" href="#def_commit">commit</a>. Tags (not + <a class="link" href="#def_tag_object">tag objects</a>) are stored in <code class="literal">$GIT_DIR/refs/tags/</code>. A git tag has nothing to do with a Lisp tag (which would be - called an <a href="#def_object_type">object type</a> in git's context). A + called an <a class="link" href="#def_object_type">object type</a> in git's context). A tag is most typically used to mark a particular point in the - commit ancestry <a href="#def_chain">chain</a>. + commit ancestry <a class="link" href="#def_chain">chain</a>. </dd><dt><span class="term"> <a name="def_tag_object"></a>tag object </span></dt><dd> - An <a href="#def_object">object</a> containing a <a href="#def_ref">ref</a> pointing to + An <a class="link" href="#def_object">object</a> containing a <a class="link" href="#def_ref">ref</a> pointing to another object, which can contain a message just like a - <a href="#def_commit_object">commit object</a>. It can also contain a (PGP) + <a class="link" href="#def_commit_object">commit object</a>. It can also contain a (PGP) signature, in which case it is called a "signed tag object". </dd><dt><span class="term"> <a name="def_topic_branch"></a>topic branch </span></dt><dd> - A regular git <a href="#def_branch">branch</a> that is used by a developer to + A regular git <a class="link" href="#def_branch">branch</a> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet @@ -2327,42 +2327,42 @@ </dd><dt><span class="term"> <a name="def_tracking_branch"></a>tracking branch </span></dt><dd> - A regular git <a href="#def_branch">branch</a> that is used to follow changes from - another <a href="#def_repository">repository</a>. A tracking + A regular git <a class="link" href="#def_branch">branch</a> that is used to follow changes from + another <a class="link" href="#def_repository">repository</a>. A tracking branch should not contain direct modifications or have local commits made to it. A tracking branch can usually be - identified as the right-hand-side <a href="#def_ref">ref</a> in a Pull: - <a href="#def_refspec">refspec</a>. + identified as the right-hand-side <a class="link" href="#def_ref">ref</a> in a Pull: + <a class="link" href="#def_refspec">refspec</a>. </dd><dt><span class="term"> <a name="def_tree"></a>tree </span></dt><dd> - Either a <a href="#def_working_tree">working tree</a>, or a <a href="#def_tree_object">tree object</a> together with the dependent <a href="#def_blob_object">blob</a> and tree objects + Either a <a class="link" href="#def_working_tree">working tree</a>, or a <a class="link" href="#def_tree_object">tree object</a> together with the dependent <a class="link" href="#def_blob_object">blob</a> and tree objects (i.e. a stored representation of a working tree). </dd><dt><span class="term"> <a name="def_tree_object"></a>tree object </span></dt><dd> - An <a href="#def_object">object</a> containing a list of file names and modes along + An <a class="link" href="#def_object">object</a> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A - <a href="#def_tree">tree</a> is equivalent to a <a href="#def_directory">directory</a>. + <a class="link" href="#def_tree">tree</a> is equivalent to a <a class="link" href="#def_directory">directory</a>. </dd><dt><span class="term"> <a name="def_tree-ish"></a>tree-ish </span></dt><dd> - A <a href="#def_ref">ref</a> pointing to either a <a href="#def_commit_object">commit object</a>, a <a href="#def_tree_object">tree object</a>, or a <a href="#def_tag_object">tag object</a> pointing to a tag or commit or tree object. + A <a class="link" href="#def_ref">ref</a> pointing to either a <a class="link" href="#def_commit_object">commit object</a>, a <a class="link" href="#def_tree_object">tree object</a>, or a <a class="link" href="#def_tag_object">tag object</a> pointing to a tag or commit or tree object. </dd><dt><span class="term"> <a name="def_unmerged_index"></a>unmerged index </span></dt><dd> - An <a href="#def_index">index</a> which contains unmerged - <a href="#def_index_entry">index entries</a>. + An <a class="link" href="#def_index">index</a> which contains unmerged + <a class="link" href="#def_index_entry">index entries</a>. </dd><dt><span class="term"> <a name="def_unreachable_object"></a>unreachable object </span></dt><dd> - An <a href="#def_object">object</a> which is not <a href="#def_reachable">reachable</a> from a - <a href="#def_branch">branch</a>, <a href="#def_tag">tag</a>, or any other reference. + An <a class="link" href="#def_object">object</a> which is not <a class="link" href="#def_reachable">reachable</a> from a + <a class="link" href="#def_branch">branch</a>, <a class="link" href="#def_tag">tag</a>, or any other reference. </dd><dt><span class="term"> <a name="def_working_tree"></a>working tree </span></dt><dd> The tree of actual checked out files. The working tree is - normally equal to the <a href="#def_HEAD">HEAD</a> plus any local changes + normally equal to the <a class="link" href="#def_HEAD">HEAD</a> plus any local changes that you have made but not yet committed. </dd></dl></div></div><div class="appendix" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="git-quick-start"></a>Appendix A. Git Quick Reference</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></div><p>This is a quick summary of the major commands; the previous chapters explain how these work in more detail.</p><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="quick-creating-a-new-repository"></a>Creating a new repository</h2></div></div></div><p>From a tarball:</p><div class="literallayout"><p>$ tar xzf project.tar.gz<br> @@ -2454,7 +2454,7 @@ </li><li> hooks </li><li> -list of commands in <a href="git.html" target="_top">git(1)</a> +list of commands in <a class="ulink" href="git.html" target="_top">git(1)</a> </li></ul></div><p>Scan email archives for other stuff left out</p><p>Scan man pages to see if any assume more background than this manual provides.</p><p>Simplify beginning by suggesting disconnected head instead of temporary branch creation?</p><p>Add more good examples. Entire sections of just cookbook examples diff --git a/user-manual.txt b/user-manual.txt index ca13266..01c1af6 100644 --- a/user-manual.txt +++ b/user-manual.txt
@@ -1303,7 +1303,7 @@ $ git diff --theirs file.txt # same as the above. ------------------------------------------------- -The linkgit:git-log[1] and gitk[1] commands also provide special help +The linkgit:git-log[1] and linkgit:gitk[1] commands also provide special help for merges: ------------------------------------------------- @@ -1963,10 +1963,10 @@ This can happen, for example, if you: - - use `git reset --hard` to remove already-published commits, or - - use `git commit --amend` to replace already-published commits + - use `git-reset --hard` to remove already-published commits, or + - use `git-commit --amend` to replace already-published commits (as in <<fixing-a-mistake-by-rewriting-history>>), or - - use `git rebase` to rebase any already-published commits (as + - use `git-rebase` to rebase any already-published commits (as in <<using-git-rebase>>). You may force git-push to perform the update anyway by preceding the @@ -2170,7 +2170,7 @@ changes are in a specific branch, use: ------------------------------------------------- -$ git log linux..branchname | git-shortlog +$ git log linux..branchname | git shortlog ------------------------------------------------- To see whether it has already been merged into the test or release branches, @@ -2443,8 +2443,8 @@ ................................................ In the process, it may discover conflicts. In that case it will stop -and allow you to fix the conflicts; after fixing conflicts, use "git -add" to update the index with those contents, and then, instead of +and allow you to fix the conflicts; after fixing conflicts, use "git-add" +to update the index with those contents, and then, instead of running git-commit, just run ------------------------------------------------- @@ -2700,8 +2700,8 @@ git fetch and fast-forwards --------------------------- -In the previous example, when updating an existing branch, "git -fetch" checks to make sure that the most recent commit on the remote +In the previous example, when updating an existing branch, "git-fetch" +checks to make sure that the most recent commit on the remote branch is a descendant of the most recent commit on your copy of the branch before updating your copy of the branch to point at the new commit. Git calls this process a <<fast-forwards,fast forward>>. @@ -2726,7 +2726,7 @@ o--o--o <-- new head of the branch ................................................ -In this case, "git fetch" will fail, and print out a warning. +In this case, "git-fetch" will fail, and print out a warning. In that case, you can still force git to update to the new head, as described in the following section. However, note that in the @@ -3106,7 +3106,7 @@ to remove any of the "loose" objects that are now contained in the pack. This will also remove any unreferenced objects (which may be -created when, for example, you use "git reset" to remove a commit). +created when, for example, you use "git-reset" to remove a commit). You can verify that the loose objects are gone by looking at the .git/objects directory or by running @@ -3135,7 +3135,7 @@ pointer itself just doesn't, since you replaced it with another one. There are also other situations that cause dangling objects. For -example, a "dangling blob" may arise because you did a "git add" of a +example, a "dangling blob" may arise because you did a "git-add" of a file, but then, before you actually committed it and made it part of the bigger picture, you changed something else in that file and committed that *updated* thing--the old state that you added originally ends up @@ -3185,7 +3185,7 @@ almost always the result of either being a half-way mergebase (the blob will often even have the conflict markers from a merge in it, if you have had conflicting merges that you fixed up by hand), or simply -because you interrupted a "git fetch" with ^C or something like that, +because you interrupted a "git-fetch" with ^C or something like that, leaving _some_ of the new objects in the object database, but just dangling and useless. @@ -3694,7 +3694,7 @@ considering a removed file to be a valid thing, and if the file really does not exist any more, it will update the index accordingly. -As a special case, you can also do `git-update-index --refresh`, which +As a special case, you can also do `git update-index --refresh`, which will refresh the "stat" information of each index to match the current stat information. It will 'not' update the object status itself, and it will only update the fields that are used to quickly test whether @@ -3770,7 +3770,7 @@ Tying it all together ~~~~~~~~~~~~~~~~~~~~~ -To commit a tree you have instantiated with "git-write-tree", you'd +To commit a tree you have instantiated with "git write-tree", you'd create a "commit" object that refers to that tree and the history behind it--most notably the "parent" commits that preceded it in history. @@ -3927,7 +3927,7 @@ which will do all trivial merge operations for you directly in the index file, and you can just write the result out with -`git-write-tree`. +`git write-tree`. [[merging-multiple-trees-2]] @@ -4095,7 +4095,7 @@ This is just to get you into the groove for the most libified part of Git: the revision walker. -Basically, the initial version of `git log` was a shell script: +Basically, the initial version of `git-log` was a shell script: ---------------------------------------------------------------- $ git-rev-list --pretty $(git-rev-parse --default HEAD "$@") | \ @@ -4130,7 +4130,7 @@ `git show v1.3.0{tilde}155^2{tilde}4` and scroll down to that function (note that you no longer need to call `setup_pager()` directly). -Nowadays, `git log` is a builtin, which means that it is _contained_ in the +Nowadays, `git-log` is a builtin, which means that it is _contained_ in the command `git`. The source side of a builtin is - a function called `cmd_<bla>`, typically defined in `builtin-<bla>.c`, @@ -4146,7 +4146,7 @@ _not_ named like the `.c` file in which they live have to be listed in `BUILT_INS` in the `Makefile`. -`git log` looks more complicated in C than it does in the original script, +`git-log` looks more complicated in C than it does in the original script, but that allows for a much greater flexibility and performance. Here again it is a good point to take a pause. @@ -4157,9 +4157,9 @@ So, think about something which you are interested in, say, "how can I access a blob just knowing the object name of it?". The first step is to find a Git command with which you can do it. In this example, it is either -`git show` or `git cat-file`. +`git-show` or `git-cat-file`. -For the sake of clarity, let's stay with `git cat-file`, because it +For the sake of clarity, let's stay with `git-cat-file`, because it - is plumbing, and 